From 76510d58bb66a2e0fb0909330ac0d3ac97c083e1 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 19 Dec 2018 08:53:43 -0800 Subject: [PATCH 01/42] Matched up to sub_80DBF68, sub_80DBF90 WIP. --- asm/contest.s | 974 ---------------------------------------------- include/contest.h | 8 + src/contest.c | 308 ++++++++++++++- 3 files changed, 313 insertions(+), 977 deletions(-) diff --git a/asm/contest.s b/asm/contest.s index a9abd94302..8a148e529a 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -5,980 +5,6 @@ .text - thumb_func_start sub_80DB884 -sub_80DB884: @ 80DB884 - push {r4,lr} - movs r4, 0 -_080DB888: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80DB798 - adds r4, 0x1 - cmp r4, 0x3 - ble _080DB888 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DB884 - - thumb_func_start sub_80DB89C -sub_80DB89C: @ 80DB89C - push {lr} - movs r0, 0x4 - movs r1, 0 - bl FillWindowPixelBuffer - movs r0, 0x4 - movs r1, 0x2 - bl CopyWindowToVram - movs r0, 0 - bl Contest_SetBgCopyFlags - pop {r0} - bx r0 - thumb_func_end sub_80DB89C - - thumb_func_start sub_80DB8B8 -sub_80DB8B8: @ 80DB8B8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r5, r4, 0 - adds r0, r4, 0 - bl Contest_IsMonsTurnDisabled - lsls r0, 24 - cmp r0, 0 - beq _080DB8D0 - movs r0, 0 - b _080DB90A -_080DB8D0: - ldr r0, =gContestPlayerMonIndex - ldrb r0, [r0] - cmp r4, r0 - beq _080DB8F4 - adds r0, r4, 0 - bl ContestAI_ResetAI - bl ContestAI_GetActionToUse - lsls r0, 24 - ldr r2, =gContestMons - lsrs r0, 23 - lsls r1, r4, 6 - b _080DB902 - .pool -_080DB8F4: - ldr r2, =gContestMons - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 1 - lsls r1, r5, 6 -_080DB902: - adds r0, r1 - adds r2, 0x1E - adds r0, r2 - ldrh r0, [r0] -_080DB90A: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DB8B8 - - thumb_func_start sub_80DB918 -sub_80DB918: @ 80DB918 - push {r4,r5,lr} - movs r4, 0 - movs r5, 0 -_080DB91E: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80DB8B8 - ldr r1, =gContestResources - ldr r1, [r1] - ldr r1, [r1, 0x4] - adds r1, r5, r1 - strh r0, [r1, 0x6] - adds r5, 0x1C - adds r4, 0x1 - cmp r4, 0x3 - ble _080DB91E - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DB918 - - thumb_func_start sub_80DB944 -sub_80DB944: @ 80DB944 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - ldr r5, =gContestResources - mov r4, sp - movs r3, 0 - movs r6, 0x3 -_080DB956: - ldr r2, [r5] - ldr r1, [r2, 0x4] - adds r1, r3, r1 - ldrh r0, [r1, 0x2] - ldrh r7, [r1, 0x4] - adds r0, r7 - strh r0, [r1, 0x4] - ldr r0, [r2, 0x4] - adds r0, r3, r0 - ldrh r0, [r0, 0x4] - strh r0, [r4] - adds r4, 0x2 - adds r3, 0x1C - subs r6, 0x1 - cmp r6, 0 - bge _080DB956 - movs r6, 0 -_080DB978: - movs r4, 0x3 - cmp r4, r6 - ble _080DB9A4 -_080DB97E: - subs r5, r4, 0x1 - lsls r0, r5, 1 - mov r1, sp - adds r3, r1, r0 - lsls r0, r4, 1 - adds r2, r1, r0 - ldrh r4, [r3] - movs r7, 0 - ldrsh r1, [r3, r7] - movs r7, 0 - ldrsh r0, [r2, r7] - cmp r1, r0 - bge _080DB99E - ldrh r0, [r2] - strh r4, [r2] - strh r0, [r3] -_080DB99E: - adds r4, r5, 0 - cmp r4, r6 - bgt _080DB97E -_080DB9A4: - adds r6, 0x1 - cmp r6, 0x2 - ble _080DB978 - movs r6, 0 - movs r0, 0x4 - negs r0, r0 - mov r9, r0 - ldr r1, =gContestResources - mov r8, r1 - movs r7, 0x3 - mov r12, r7 -_080DB9BA: - movs r4, 0 - lsls r0, r6, 3 - adds r7, r6, 0x1 - subs r0, r6 - lsls r5, r0, 2 - mov r3, sp -_080DB9C6: - mov r1, r8 - ldr r0, [r1] - ldr r0, [r0, 0x4] - adds r2, r5, r0 - movs r6, 0x4 - ldrsh r1, [r2, r6] - movs r6, 0 - ldrsh r0, [r3, r6] - cmp r1, r0 - bne _080DB9F0 - mov r0, r12 - ands r4, r0 - ldrb r1, [r2, 0xB] - mov r0, r9 - ands r0, r1 - orrs r0, r4 - strb r0, [r2, 0xB] - b _080DB9F8 - .pool -_080DB9F0: - adds r3, 0x2 - adds r4, 0x1 - cmp r4, 0x3 - ble _080DB9C6 -_080DB9F8: - adds r6, r7, 0 - cmp r6, 0x3 - ble _080DB9BA - movs r0, 0x1 - bl sub_80DCE58 - bl sub_80DD590 - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80DB944 - - thumb_func_start sub_80DBA18 -sub_80DBA18: @ 80DBA18 - push {r4,r5,lr} - ldr r4, =gContestResources - movs r2, 0 - movs r3, 0x3 -_080DBA20: - ldr r0, [r4] - ldr r0, [r0, 0x4] - adds r1, r2, r0 - ldrh r0, [r1, 0x6] - cmp r0, 0 - bne _080DBA34 - movs r1, 0x5 - b _080DBA52 - .pool -_080DBA34: - movs r5, 0x2 - ldrsh r0, [r1, r5] - movs r1, 0 - cmp r0, 0 - ble _080DBA52 - movs r1, 0x1 - cmp r0, 0x1D - ble _080DBA52 - movs r1, 0x2 - cmp r0, 0x3B - ble _080DBA52 - movs r1, 0x4 - cmp r0, 0x4F - bgt _080DBA52 - movs r1, 0x3 -_080DBA52: - ldr r0, [r4] - ldr r0, [r0, 0x4] - adds r0, r2, r0 - strb r1, [r0, 0x1A] - adds r2, 0x1C - subs r3, 0x1 - cmp r3, 0 - bge _080DBA20 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DBA18 - - thumb_func_start sub_80DBA68 -sub_80DBA68: @ 80DBA68 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gContestResources - ldr r1, [r1] - ldr r2, [r1, 0x4] - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r2, r1, r2 - ldrb r1, [r2, 0xC] - movs r0, 0x6 - ands r0, r1 - cmp r0, 0 - bne _080DBA90 - ldrb r1, [r2, 0xB] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080DBA98 -_080DBA90: - movs r0, 0 - b _080DBA9A - .pool -_080DBA98: - movs r0, 0x1 -_080DBA9A: - pop {r1} - bx r1 - thumb_func_end sub_80DBA68 - - thumb_func_start sub_80DBAA0 -sub_80DBAA0: @ 80DBAA0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r5, =gContestResources - movs r0, 0 - mov r8, r0 - movs r1, 0x7 - negs r1, r1 - mov r10, r1 - movs r0, 0x2 - negs r0, r0 - mov r9, r0 - movs r4, 0 - movs r6, 0x3 -_080DBAC0: - ldr r1, [r5] - ldr r0, [r1, 0x4] - adds r0, r4, r0 - movs r2, 0 - strh r2, [r0, 0x2] - ldr r0, [r1, 0x4] - adds r0, r4, r0 - strh r2, [r0] - ldr r0, [r1, 0x4] - adds r0, r4, r0 - mov r1, r8 - strb r1, [r0, 0x12] - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r3, r4, r0 - ldrb r2, [r3, 0xC] - movs r0, 0x6 - ands r0, r2 - cmp r0, 0 - beq _080DBAFC - lsls r0, r2, 29 - lsrs r0, 30 - subs r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 1 - mov r1, r10 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xC] -_080DBAFC: - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - mov r1, r8 - strb r1, [r0, 0xE] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x10] - mov r0, r9 - ands r0, r2 - strb r0, [r1, 0x10] - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - mov r1, r8 - strb r1, [r0, 0xF] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x10] - movs r0, 0x3 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x10] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x10] - movs r7, 0x5 - negs r7, r7 - adds r0, r7, 0 - ands r0, r2 - strb r0, [r1, 0x10] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x10] - movs r0, 0x9 - negs r0, r0 - mov r12, r0 - ands r0, r2 - strb r0, [r1, 0x10] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0xC] - mov r0, r9 - ands r0, r2 - strb r0, [r1, 0xC] - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - movs r1, 0xFF - strb r1, [r0, 0x13] - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - movs r1, 0x1 - negs r1, r1 - strb r1, [r0, 0x14] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x10] - movs r0, 0x31 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x10] - ldr r0, [r5] - ldr r2, [r0, 0x4] - adds r2, r4, r2 - ldrb r3, [r2, 0x15] - lsls r1, r3, 31 - lsrs r1, 31 - lsls r1, 2 - adds r0, r7, 0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2, 0x15] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x15] - mov r0, r9 - ands r0, r2 - strb r0, [r1, 0x15] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x11] - movs r0, 0x4 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x11] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x11] - movs r0, 0x21 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x11] - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r2, r4, r0 - ldrb r1, [r2, 0x11] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080DBBF4 - ldrb r1, [r2, 0xC] - mov r0, r10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0xC] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x11] - adds r0, r7, 0 - ands r0, r2 - strb r0, [r1, 0x11] -_080DBBF4: - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r2, r4, r0 - ldrb r1, [r2, 0x11] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080DBC1A - ldrb r0, [r2, 0xB] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0xB] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x11] - mov r0, r12 - ands r0, r2 - strb r0, [r1, 0x11] -_080DBC1A: - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x11] - movs r0, 0x11 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x11] - adds r4, 0x1C - subs r6, 0x1 - cmp r6, 0 - blt _080DBC34 - b _080DBAC0 -_080DBC34: - movs r6, 0 - ldr r5, =gContestResources - movs r7, 0 - movs r4, 0 -_080DBC3C: - ldr r3, [r5] - ldr r0, [r3, 0x4] - adds r0, r4, r0 - ldrh r1, [r0, 0x6] - strh r1, [r0, 0x8] - ldr r2, [r3] - lsls r1, r6, 1 - ldrb r0, [r2, 0x1] - lsls r0, 3 - adds r1, r0 - adds r2, 0x1C - adds r2, r1 - ldr r0, [r3, 0x4] - adds r0, r4, r0 - ldrh r0, [r0, 0x6] - strh r0, [r2] - ldr r0, [r3, 0x4] - adds r0, r4, r0 - ldrh r0, [r0, 0x6] - bl Contest_GetMoveExcitement - ldr r1, [r5] - ldr r2, [r1] - ldrb r1, [r2, 0x1] - lsls r1, 2 - adds r1, r6, r1 - adds r2, 0x44 - adds r2, r1 - strb r0, [r2] - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - strh r7, [r0, 0x6] - adds r4, 0x1C - adds r6, 0x1 - cmp r6, 0x3 - ble _080DBC3C - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0, 0x10] - ldrb r1, [r2, 0x1] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x1] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DBAA0 - - thumb_func_start Contest_IsMonsTurnDisabled -Contest_IsMonsTurnDisabled: @ 80DBCA8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gContestResources - ldr r1, [r1] - ldr r2, [r1, 0x4] - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r2, r1, r2 - ldrb r1, [r2, 0xC] - movs r0, 0x6 - ands r0, r1 - cmp r0, 0 - bne _080DBCD0 - ldrb r1, [r2, 0xB] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080DBCD8 -_080DBCD0: - movs r0, 0x1 - b _080DBCDA - .pool -_080DBCD8: - movs r0, 0 -_080DBCDA: - pop {r1} - bx r1 - thumb_func_end Contest_IsMonsTurnDisabled - - thumb_func_start sub_80DBCE0 -sub_80DBCE0: @ 80DBCE0 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl sub_80DBD34 - ldr r1, =gUnknown_02039F18 - lsls r4, 1 - adds r1, r4, r1 - strh r0, [r1] - ldr r2, =gUnknown_02039F08 - adds r2, r4, r2 - ldr r1, =gContestMonConditions - adds r4, r1 - ldrh r4, [r4] - adds r0, r4 - strh r0, [r2] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DBCE0 - - thumb_func_start sub_80DBD18 -sub_80DBD18: @ 80DBD18 - push {r4,lr} - movs r4, 0 -_080DBD1C: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80DBCE0 - adds r4, 0x1 - cmp r4, 0x3 - ble _080DBD1C - bl sub_80DBD4C - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DBD18 - - thumb_func_start sub_80DBD34 -sub_80DBD34: @ 80DBD34 - lsls r0, 24 - ldr r1, =gUnknown_02039F10 - lsrs r0, 23 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - lsls r0, 17 - asrs r0, 16 - bx lr - .pool - thumb_func_end sub_80DBD34 - - thumb_func_start sub_80DBD4C -sub_80DBD4C: @ 80DBD4C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x70 - mov r0, sp - movs r1, 0 - movs r2, 0x8 - bl memset - movs r0, 0 - mov r9, r0 - mov r1, sp - adds r1, 0x8 - str r1, [sp, 0x64] - mov r3, sp - adds r3, 0xC - str r3, [sp, 0x68] - mov r6, sp - adds r6, 0x14 - str r6, [sp, 0x6C] - mov r4, sp -_080DBD7A: - bl Random - strh r0, [r4] - movs r2, 0 - cmp r2, r9 - bge _080DBDB8 - mov r1, sp - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r1] - cmp r0, r1 - bne _080DBD9C - subs r4, 0x2 - movs r7, 0x1 - negs r7, r7 - add r9, r7 - b _080DBDB8 -_080DBD9C: - adds r2, 0x1 - cmp r2, r9 - bge _080DBDB8 - lsls r0, r2, 1 - mov r3, sp - adds r1, r3, r0 - ldrh r0, [r4] - ldrh r1, [r1] - cmp r0, r1 - bne _080DBD9C - subs r4, 0x2 - movs r6, 0x1 - negs r6, r6 - add r9, r6 -_080DBDB8: - adds r4, 0x2 - movs r7, 0x1 - add r9, r7 - mov r0, r9 - cmp r0, 0x3 - ble _080DBD7A - movs r1, 0 - mov r9, r1 - mov r4, sp - ldr r6, =gUnknown_02039F08 - ldr r2, [sp, 0x64] - ldr r5, =gContestMonConditions - ldr r3, [sp, 0x68] -_080DBDD2: - mov r7, r9 - lsls r1, r7, 4 - movs r7, 0 - ldrsh r0, [r6, r7] - str r0, [r2] - movs r7, 0 - ldrsh r0, [r5, r7] - str r0, [r3] - ldrh r0, [r4] - str r0, [r2, 0x8] - ldr r0, [sp, 0x6C] - adds r1, r0, r1 - mov r7, r9 - str r7, [r1] - adds r4, 0x2 - adds r6, 0x2 - adds r2, 0x10 - adds r5, 0x2 - adds r3, 0x10 - movs r0, 0x1 - add r9, r0 - mov r1, r9 - cmp r1, 0x3 - ble _080DBDD2 - movs r3, 0 - mov r9, r3 -_080DBE06: - movs r4, 0x3 - cmp r4, r9 - ble _080DBE90 - add r7, sp, 0x48 - ldr r6, [sp, 0x68] - str r6, [sp, 0x58] - ldr r0, [sp, 0x64] - adds r0, 0x8 - str r0, [sp, 0x5C] - ldr r1, [sp, 0x6C] - str r1, [sp, 0x60] -_080DBE1C: - subs r3, r4, 0x1 - mov r10, r3 - mov r0, r10 - adds r1, r4, 0 - ldr r2, [sp, 0x64] - bl sub_80DBF30 - lsls r0, 24 - cmp r0, 0 - beq _080DBE8A - mov r6, r10 - lsls r2, r6, 4 - ldr r0, [sp, 0x64] - adds r3, r0, r2 - ldr r0, [r3] - str r0, [sp, 0x48] - ldr r1, [sp, 0x58] - adds r6, r1, r2 - ldr r0, [r6] - str r0, [r7, 0x4] - ldr r0, [sp, 0x5C] - adds r0, r2 - mov r8, r0 - ldr r0, [r0] - str r0, [r7, 0x8] - ldr r1, [sp, 0x60] - adds r2, r1, r2 - ldr r0, [r2] - str r0, [r7, 0xC] - lsls r1, r4, 4 - ldr r0, [sp, 0x64] - adds r5, r0, r1 - ldr r0, [r5] - str r0, [r3] - ldr r3, [sp, 0x58] - adds r4, r3, r1 - ldr r0, [r4] - str r0, [r6] - ldr r6, [sp, 0x5C] - adds r3, r6, r1 - ldr r0, [r3] - mov r6, r8 - str r0, [r6] - ldr r0, [sp, 0x60] - adds r1, r0, r1 - ldr r0, [r1] - str r0, [r2] - ldr r0, [sp, 0x48] - str r0, [r5] - ldr r0, [r7, 0x4] - str r0, [r4] - ldr r0, [r7, 0x8] - str r0, [r3] - ldr r0, [r7, 0xC] - str r0, [r1] -_080DBE8A: - mov r4, r10 - cmp r4, r9 - bgt _080DBE1C -_080DBE90: - movs r1, 0x1 - add r9, r1 - mov r3, r9 - cmp r3, 0x2 - ble _080DBE06 - movs r6, 0 - mov r9, r6 - ldr r2, =gContestFinalStandings - ldr r1, [sp, 0x6C] -_080DBEA2: - ldr r0, [r1] - adds r0, r2 - mov r7, r9 - strb r7, [r0] - adds r1, 0x10 - movs r0, 0x1 - add r9, r0 - mov r3, r9 - cmp r3, 0x3 - ble _080DBEA2 - add sp, 0x70 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DBD4C - - thumb_func_start sub_80DBED4 -sub_80DBED4: @ 80DBED4 - push {lr} - ldr r0, =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080DBF0E - ldr r0, =gSaveBlock2Ptr - ldr r2, [r0] - ldr r1, =gContestFinalStandings - ldr r0, =gContestPlayerMonIndex - ldrb r0, [r0] - adds r0, r1 - ldrb r1, [r0] - lsls r1, 1 - ldr r0, =gSpecialVar_ContestCategory - ldrh r0, [r0] - lsls r0, 3 - adds r1, r0 - ldr r0, =0x00000624 - adds r2, r0 - adds r2, r1 - ldrh r0, [r2] - adds r0, 0x1 - ldr r1, =0x0000270f - cmp r0, r1 - ble _080DBF0C - adds r0, r1, 0 -_080DBF0C: - strh r0, [r2] -_080DBF0E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DBED4 - - thumb_func_start sub_80DBF30 -sub_80DBF30: @ 80DBF30 - push {lr} - lsls r0, 4 - adds r0, r2 - lsls r1, 4 - adds r3, r1, r2 - ldr r2, [r0] - ldr r1, [r3] - cmp r2, r1 - blt _080DBF60 - cmp r2, r1 - bgt _080DBF52 - ldr r2, [r0, 0x4] - ldr r1, [r3, 0x4] - cmp r2, r1 - blt _080DBF60 - cmp r2, r1 - ble _080DBF56 -_080DBF52: - movs r2, 0 - b _080DBF62 -_080DBF56: - ldr r1, [r0, 0x8] - ldr r0, [r3, 0x8] - movs r2, 0 - cmp r1, r0 - bge _080DBF62 -_080DBF60: - movs r2, 0x1 -_080DBF62: - adds r0, r2, 0 - pop {r1} - bx r1 - thumb_func_end sub_80DBF30 - - thumb_func_start sub_80DBF68 -sub_80DBF68: @ 80DBF68 - push {lr} - ldr r0, =gBattle_BG0_Y - movs r1, 0 - strh r1, [r0] - ldr r0, =gBattle_BG2_Y - strh r1, [r0] - bl sub_80DB89C - ldr r0, =gUnknown_0827E8DA - movs r1, 0 - bl Contest_StartTextPrinter - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DBF68 - - thumb_func_start sub_80DBF90 -sub_80DBF90: @ 80DBF90 - push {r4,r5,lr} - sub sp, 0xC - movs r5, 0x80 - lsls r5, 18 - movs r4, 0x3 -_080DBF9A: - lsrs r3, r5, 24 - movs r0, 0x8 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0 - movs r2, 0x16 - bl ContestBG_FillBoxWithTile - movs r0, 0xA0 - lsls r0, 19 - adds r5, r0 - subs r4, 0x1 - cmp r4, 0 - bge _080DBF9A - add sp, 0xC - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DBF90 - thumb_func_start sub_80DBFC8 sub_80DBFC8: @ 80DBFC8 push {lr} diff --git a/include/contest.h b/include/contest.h index 73ebb79fa1..4ab4d350c5 100644 --- a/include/contest.h +++ b/include/contest.h @@ -385,6 +385,14 @@ struct UnknownContestStruct4 u8 unk2_2:1; }; +struct UnknownContestStruct6 +{ + s32 unk0; + s32 unk4; + s32 unk8; + s32 unkC; +}; + struct ContestResourcesField1C { u8 filler_00[0x40]; diff --git a/src/contest.c b/src/contest.c index 7decf88fc8..da4fdb3e03 100644 --- a/src/contest.c +++ b/src/contest.c @@ -42,6 +42,7 @@ #include "international_string_util.h" #include "data2.h" #include "constants/rgb.h" +#include "contest_ai.h" extern void (*gFieldCallback)(void); @@ -104,7 +105,7 @@ void sub_80DB2BC(void); void prints_contest_move_description(u16); u16 sub_80DE84C(u16); void sub_80DB89C(void); -u16 sub_80DB8B8(u8); +u16 GetChosenMove(u8); void sub_80DB918(void); bool8 Contest_IsMonsTurnDisabled(u8); void sub_80DBF68(void); @@ -169,6 +170,9 @@ void sub_80DF9D4(u8 *); void sub_80DF9E0(u8 *, s32); void ContestBG_FillBoxWithTile(u8, u16, u8, u8, u8, u8, u8); void Contest_PrintTextToBg0WindowStd(u8, const u8 *); +s16 sub_80DBD34(u8); +void DetermineFinalStandings(void); +bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *); EWRAM_DATA struct ContestPokemon gContestMons[4] = {0}; EWRAM_DATA s16 gContestMonConditions[4] = {0}; @@ -199,6 +203,7 @@ extern const struct WindowTemplate gUnknown_08587F44[]; extern const u8 *const gUnknown_08587D90[]; extern const u8 *const gUnknown_08587F08[]; extern const u8 *const gUnknown_08587F1C[]; +extern const u8 *const gUnknown_0827E8DA[]; extern const u8 gText_0827D55A[]; extern const u8 gText_0827E793[]; extern const u8 gText_0827E32E[]; @@ -855,7 +860,7 @@ void sub_80D8894(u8 taskId) { if (gIsLinkContest & 1) { - u16 var = sub_80DB8B8(gContestPlayerMonIndex); + u16 var = GetChosenMove(gContestPlayerMonIndex); u8 taskId2; gContestResources->field_4[gContestPlayerMonIndex].currMove = var; @@ -934,7 +939,7 @@ void sub_80D8A88(u8 taskId) for (i = 0; i + gNumLinkContestPlayers < 4; i++) { - gContestResources->field_4[gNumLinkContestPlayers + i].currMove = sub_80DB8B8(gNumLinkContestPlayers + i); + gContestResources->field_4[gNumLinkContestPlayers + i].currMove = GetChosenMove(gNumLinkContestPlayers + i); } } gTasks[taskId].data[0] = 0; @@ -2740,3 +2745,300 @@ bool8 sub_80DB798(u8 a) } return r9; } + +void sub_80DB884(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + sub_80DB798(i); +} + +void sub_80DB89C(void) +{ + FillWindowPixelBuffer(4, 0); + CopyWindowToVram(4, 2); + Contest_SetBgCopyFlags(0); +} + +u16 GetChosenMove(u8 a) +{ + if (Contest_IsMonsTurnDisabled(a)) + return 0; + if (a == gContestPlayerMonIndex) + { + return gContestMons[a].moves[sContest.playerMoveChoice]; + } + else + { + u8 moveChoice; + + ContestAI_ResetAI(a); + moveChoice = ContestAI_GetActionToUse(); + return gContestMons[a].moves[moveChoice]; + } +} + +void sub_80DB918(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + sContestantStatus[i].currMove = GetChosenMove(i); +} + +void sub_80DB944(void) +{ + s32 i; + s32 j; + s16 arr[4]; + + for (i = 0; i < 4; i++) + { + sContestantStatus[i].unk4 += sContestantStatus[i].appeal2; + arr[i] = sContestantStatus[i].unk4; + } + for (i = 0; i < 3; i++) + { + for (j = 3; j > i; j--) + { + if (arr[j - 1] < arr[j]) + { + u16 temp = arr[j]; + + arr[j] = arr[j - 1]; + arr[j - 1] = temp; + } + } + } + for (i = 0; i < 4; i++) + { + for (j = 0; j < 4; j++) + { + if (sContestantStatus[i].unk4 == arr[j]) + { + sContestantStatus[i].unkB_0 = j; + break; + } + } + } + sub_80DCE58(1); + sub_80DD590(); +} + +void sub_80DBA18(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + u8 attentionLevel; + + if (sContestantStatus[i].currMove == MOVE_NONE) + attentionLevel = 5; + else if (sContestantStatus[i].appeal2 <= 0) + attentionLevel = 0; + else if (sContestantStatus[i].appeal2 < 30) + attentionLevel = 1; + else if (sContestantStatus[i].appeal2 < 60) + attentionLevel = 2; + else if (sContestantStatus[i].appeal2 < 80) + attentionLevel = 3; + else + attentionLevel = 4; + + sContestantStatus[i].attentionLevel = attentionLevel; + } +} + +bool8 sub_80DBA68(u8 a) +{ + if (sContestantStatus[a].numTurnsSkipped != 0 || sContestantStatus[a].noMoreTurns) + return FALSE; + else + return TRUE; +} + +void sub_80DBAA0(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + sContestantStatus[i].appeal2 = 0; + sContestantStatus[i].appeal1 = 0; + sContestantStatus[i].jamSafetyCount = 0; + if (sContestantStatus[i].numTurnsSkipped > 0) + sContestantStatus[i].numTurnsSkipped--; + sContestantStatus[i].jam = 0; + sContestantStatus[i].resistant = 0; + sContestantStatus[i].jamReduction = 0; + sContestantStatus[i].immune = 0; + sContestantStatus[i].moreEasilyStartled = 0; + sContestantStatus[i].usedRepeatableMove = 0; + sContestantStatus[i].nervous = 0; + sContestantStatus[i].effectStringId = CONTEST_STRING_NONE; + sContestantStatus[i].effectStringId2 = CONTEST_STRING_NONE; + sContestantStatus[i].conditionMod = 0; + sContestantStatus[i].unk15_2 = sContestantStatus[i].disappointedRepeat; + sContestantStatus[i].disappointedRepeat = FALSE; + sContestantStatus[i].turnOrderModAction = 0; + sContestantStatus[i].appealTripleCondition = 0; + if (sContestantStatus[i].turnSkipped) + { + sContestantStatus[i].numTurnsSkipped = 1; + sContestantStatus[i].turnSkipped = 0; + } + if (sContestantStatus[i].exploded) + { + sContestantStatus[i].noMoreTurns = 1; + sContestantStatus[i].exploded = 0; + } + sContestantStatus[i].overrideCategoryExcitementMod = 0; + } + for (i = 0; i < 4; i++) + { + sContestantStatus[i].prevMove = sContestantStatus[i].currMove; + sContest.unk19220[sContest.turnNumber][i] = sContestantStatus[i].currMove; + sContest.unk19248[sContest.turnNumber][i] = Contest_GetMoveExcitement(sContestantStatus[i].currMove); + sContestantStatus[i].currMove = MOVE_NONE; + } + shared19328.excitementFrozen = 0; +} + +bool8 Contest_IsMonsTurnDisabled(u8 a) +{ + if (sContestantStatus[a].numTurnsSkipped != 0 || sContestantStatus[a].noMoreTurns) + return TRUE; + else + return FALSE; +} + +void sub_80DBCE0(u8 a) +{ + gUnknown_02039F18[a] = sub_80DBD34(a); + gUnknown_02039F08[a] = gContestMonConditions[a] + gUnknown_02039F18[a]; +} + +void sub_80DBD18(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + sub_80DBCE0(i); + DetermineFinalStandings(); +} + +s16 sub_80DBD34(u8 a) +{ + return gUnknown_02039F10[a] * 2; +} + +void DetermineFinalStandings(void) +{ + u16 sp0[4] = {0}; + struct UnknownContestStruct6 sp8[4]; + s32 i; + s32 j; + + for (i = 0; i < 4; i++) + { + s32 r2; + + sp0[i] = Random(); + for (r2 = 0; r2 < i; r2++) + { + if (sp0[i] == sp0[r2]) + { + i--; + break; + } + } + } + + for (i = 0; i < 4; i++) + { + sp8[i].unk0 = gUnknown_02039F08[i]; + sp8[i].unk4 = gContestMonConditions[i]; + sp8[i].unk8 = sp0[i]; + sp8[i].unkC = i; + } + + for (i = 0; i < 3; i++) + { + for (j = 3; j > i; j--) + { + if (sub_80DBF30(j - 1, j, sp8)) + { + struct UnknownContestStruct6 temp; + + temp.unk0 = sp8[j - 1].unk0; + temp.unk4 = sp8[j - 1].unk4; + temp.unk8 = sp8[j - 1].unk8; + temp.unkC = sp8[j - 1].unkC; + + sp8[j - 1].unk0 = sp8[j].unk0; + sp8[j - 1].unk4 = sp8[j].unk4; + sp8[j - 1].unk8 = sp8[j].unk8; + sp8[j - 1].unkC = sp8[j].unkC; + + sp8[j].unk0 = temp.unk0; + sp8[j].unk4 = temp.unk4; + sp8[j].unk8 = temp.unk8; + sp8[j].unkC = temp.unkC; + } + } + } + + for (i = 0; i < 4; i++) + gContestFinalStandings[sp8[i].unkC] = i; +} + +void sub_80DBED4(void) +{ + if ((gIsLinkContest & 1)) + { + gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] = + ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 0x270F) ? 0x270F : + (gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1); + + } +} + +bool8 sub_80DBF30(s32 a, s32 b, struct UnknownContestStruct6 *c) +{ + bool8 retVal; + + if (c[a].unk0 < c[b].unk0) + retVal = TRUE; + else if (c[a].unk0 > c[b].unk0) + retVal = FALSE; + else if (c[a].unk4 < c[b].unk4) + retVal = TRUE; + else if (c[a].unk4 > c[b].unk4) + retVal = FALSE; + else if (c[a].unk8 < c[b].unk8) + retVal = TRUE; + else + retVal = FALSE; + return retVal; +} + +void sub_80DBF68(void) +{ + gBattle_BG0_Y = 0; + gBattle_BG2_Y = 0; + sub_80DB89C(); + Contest_StartTextPrinter((u8*) &gUnknown_0827E8DA, 0); +} + +void sub_80DBF90(void) +{ + u16 temp = BGCNT_WRAP; + s32 i; + for(i = 3; i >= 0; i--) + { + ContestBG_FillBoxWithIncrementingTile(0, temp, 0, 0x16, 0, 0, 0, 0); + } +} + From f966b6584924531bd4470b98c38ec52cd0004197 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Thu, 20 Dec 2018 11:39:00 -0800 Subject: [PATCH 02/42] Through sub_80DC028, sub_80DC0F4 non-matching. --- asm/contest.s | 372 ------------------------------------------------ src/contest.c | 383 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 376 insertions(+), 379 deletions(-) diff --git a/asm/contest.s b/asm/contest.s index 8a148e529a..ebded2d2fc 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -5,378 +5,6 @@ .text - thumb_func_start sub_80DBFC8 -sub_80DBFC8: @ 80DBFC8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =0x00005011 - cmp r0, 0 - beq _080DBFE2 - ldr r1, =0x00006011 - cmp r0, 0x1 - beq _080DBFE2 - ldr r1, =0x00008011 - cmp r0, 0x2 - bne _080DBFE2 - ldr r1, =0x00007011 -_080DBFE2: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DBFC8 - - thumb_func_start sub_80DBFFC -sub_80DBFFC: @ 80DBFFC - push {lr} - lsls r0, 16 - asrs r0, 16 - movs r1, 0xA - bl __divsi3 - lsls r0, 24 - lsrs r1, r0, 24 - asrs r2, r0, 24 - cmp r2, 0x10 - ble _080DC016 - movs r1, 0x10 - b _080DC020 -_080DC016: - movs r0, 0x10 - negs r0, r0 - cmp r2, r0 - bge _080DC020 - movs r1, 0xF0 -_080DC020: - lsls r0, r1, 24 - asrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_80DBFFC - - thumb_func_start sub_80DC028 -sub_80DC028: @ 80DC028 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - adds r6, r1, 0 - lsls r5, 16 - lsrs r5, 16 - lsls r6, 16 - lsrs r6, 16 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0, 0x14] - lsls r1, r2, 2 - adds r1, r0 - ldrb r0, [r1, 0x2] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1, 0x2] - ldr r0, =sub_80DC0F4 - movs r1, 0x14 - bl CreateTask - lsls r0, 24 - lsrs r7, r0, 24 - lsls r5, 16 - asrs r5, 16 - adds r0, r5, 0 - bl sub_80DBFFC - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r6, 16 - asrs r6, 16 - adds r5, r6 - lsls r5, 16 - asrs r5, 16 - adds r0, r5, 0 - bl sub_80DBFFC - lsls r4, 24 - asrs r4, 24 - subs r0, r4 - lsls r0, 24 - lsrs r5, r0, 24 - mov r0, r8 - bl sub_80DBFC8 - ldr r2, =gTasks - lsls r3, r7, 2 - adds r0, r3, r7 - lsls r0, 3 - adds r1, r0, r2 - adds r0, r4, 0 - cmp r4, 0 - bge _080DC0A0 - negs r0, r4 -_080DC0A0: - strh r0, [r1, 0x8] - lsls r0, r5, 24 - asrs r0, 24 - strh r0, [r1, 0xA] - cmp r4, 0 - bgt _080DC0B4 - cmp r4, 0 - bne _080DC0C8 - cmp r0, 0 - ble _080DC0C8 -_080DC0B4: - movs r0, 0x1 - strh r0, [r1, 0xC] - b _080DC0D6 - .pool -_080DC0C8: - ldr r2, =gTasks - lsls r3, r7, 2 - adds r0, r3, r7 - lsls r0, 3 - adds r0, r2 - ldr r1, =0x0000ffff - strh r1, [r0, 0xC] -_080DC0D6: - adds r0, r3, r7 - lsls r0, 3 - adds r0, r2 - mov r1, r8 - strh r1, [r0, 0xE] - adds r0, r7, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DC028 - - thumb_func_start sub_80DC0F4 -sub_80DC0F4: @ 80DC0F4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r4, r0, r1 - ldrb r0, [r4, 0xE] - mov r9, r0 - ldrh r3, [r4, 0x8] - ldrh r1, [r4, 0xA] - ldrh r0, [r4, 0x1C] - adds r0, 0x1 - strh r0, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xE - bgt _080DC126 - b _080DC2A8 -_080DC126: - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r2, [r4, 0xA] - movs r5, 0xA - ldrsh r0, [r4, r5] - cmp r0, 0 - bne _080DC15C - adds r0, r7, 0 - bl DestroyTask - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0, 0x14] - mov r2, r9 - lsls r1, r2, 2 - adds r1, r0 - ldrb r2, [r1, 0x2] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x2] - b _080DC2A8 - .pool -_080DC15C: - cmp r3, 0 - bne _080DC1A4 - lsls r0, r1, 16 - mov r8, r0 - cmp r0, 0 - bge _080DC17A - mov r0, r9 - bl sub_80DBFC8 - adds r0, 0x2 - lsls r0, 16 - lsrs r6, r0, 16 - ldrh r0, [r4, 0xA] - adds r0, 0x1 - b _080DC188 -_080DC17A: - mov r0, r9 - bl sub_80DBFC8 - lsls r0, 16 - lsrs r6, r0, 16 - ldrh r0, [r4, 0xA] - subs r0, 0x1 -_080DC188: - strh r0, [r4, 0xA] - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r2, r1, 0x1 - strh r2, [r0, 0x8] - lsls r1, 24 - lsrs r5, r1, 24 - b _080DC210 - .pool -_080DC1A4: - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0 - bge _080DC1DE - lsls r0, r1, 16 - mov r8, r0 - cmp r0, 0 - bge _080DC1CC - ldrh r0, [r4, 0x8] - adds r1, r0, 0x1 - strh r1, [r4, 0x8] - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r2, 0x1 - strh r0, [r4, 0xA] - mov r0, r9 - bl sub_80DBFC8 - adds r0, 0x2 - b _080DC20C -_080DC1CC: - ldrh r0, [r4, 0x8] - subs r0, 0x1 - strh r0, [r4, 0x8] - lsls r0, 24 - lsrs r5, r0, 24 - movs r6, 0 - subs r0, r2, 0x1 - strh r0, [r4, 0xA] - b _080DC210 -_080DC1DE: - lsls r0, r1, 16 - mov r8, r0 - cmp r0, 0 - bge _080DC1F8 - ldrh r0, [r4, 0x8] - subs r0, 0x1 - strh r0, [r4, 0x8] - lsls r0, 24 - lsrs r5, r0, 24 - movs r6, 0 - adds r0, r2, 0x1 - strh r0, [r4, 0xA] - b _080DC210 -_080DC1F8: - ldrh r0, [r4, 0x8] - adds r1, r0, 0x1 - strh r1, [r4, 0x8] - lsls r0, 24 - lsrs r5, r0, 24 - subs r0, r2, 0x1 - strh r0, [r4, 0xA] - mov r0, r9 - bl sub_80DBFC8 -_080DC20C: - lsls r0, 16 - lsrs r6, r0, 16 -_080DC210: - str r5, [sp, 0xC] - movs r0, 0 - mov r10, r0 - cmp r5, 0x7 - bls _080DC226 - movs r2, 0x1 - mov r10, r2 - adds r0, r5, 0 - subs r0, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 -_080DC226: - adds r2, r5, 0 - adds r2, 0x16 - lsls r2, 24 - lsrs r2, 24 - ldr r0, =gUnknown_02039F26 - add r0, r9 - ldrb r0, [r0] - lsls r3, r0, 2 - adds r3, r0 - adds r3, 0x2 - add r3, r10 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0x1 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0 - adds r1, r6, 0 - bl ContestBG_FillBoxWithTile - mov r3, r8 - cmp r3, 0 - ble _080DC284 - movs r0, 0x60 - bl PlaySE - ldr r4, =gMPlayInfo_SE1 - adds r0, r4, 0 - bl m4aMPlayImmInit - ldr r1, =0x0000ffff - ldr r0, [sp, 0xC] - lsls r2, r0, 24 - asrs r2, 16 - adds r0, r4, 0 - bl m4aMPlayPitchControl - b _080DC28A - .pool -_080DC284: - movs r0, 0x16 - bl PlaySE -_080DC28A: - mov r2, r10 - cmp r2, 0 - bne _080DC2A8 - cmp r5, 0 - bne _080DC2A8 - cmp r6, 0 - bne _080DC2A8 - ldr r0, =gTasks - lsls r1, r7, 2 - adds r1, r7 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0xC] - negs r0, r0 - strh r0, [r1, 0xC] -_080DC2A8: - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC0F4 - thumb_func_start sub_80DC2BC sub_80DC2BC: @ 80DC2BC push {r4,r5,lr} diff --git a/src/contest.c b/src/contest.c index da4fdb3e03..4fb5f76c57 100644 --- a/src/contest.c +++ b/src/contest.c @@ -153,7 +153,7 @@ void sub_80DE12C(void); void sub_80DD45C(u8, u8); void sub_80DD720(u8); void sub_80DE008(bool8); -void sub_80DC028(s16, s16, u8); +u8 sub_80DC028(s16, s16, u8); bool8 sub_80DB5B8(u8, u8); bool8 sub_80DB798(u8); void sub_80DB884(void); @@ -173,6 +173,7 @@ void Contest_PrintTextToBg0WindowStd(u8, const u8 *); s16 sub_80DBD34(u8); void DetermineFinalStandings(void); bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *); +void sub_80DC0F4(u8); EWRAM_DATA struct ContestPokemon gContestMons[4] = {0}; EWRAM_DATA s16 gContestMonConditions[4] = {0}; @@ -3034,11 +3035,379 @@ void sub_80DBF68(void) void sub_80DBF90(void) { - u16 temp = BGCNT_WRAP; - s32 i; - for(i = 3; i >= 0; i--) - { - ContestBG_FillBoxWithIncrementingTile(0, temp, 0, 0x16, 0, 0, 0, 0); - } + int i; + + for(i = 0; i < 4; i++) + { + ContestBG_FillBoxWithTile(0, 0, 0x16, 2 + i * 5, 8, 2, 0x11); + } } +u16 sub_80DBFC8(u8 a) +{ + u16 var; + + if (a == 0) + var = 0x5011; + else if (a == 1) + var = 0x6011; + else if (a == 2) + var = 0x7011; + else + var = 0x8011; + return var + 1; +} + +s8 sub_80DBFFC(s16 a) +{ + s8 retVal = a / 10; + + if (retVal > 16) + retVal = 16; + else if (retVal < -16) + retVal = -16; + return retVal; +} + +u8 sub_80DC028(s16 a, s16 b, u8 c) +{ + u8 taskId; + s8 r4; + s8 r5; + + gContestResources->field_14[c].unk2_2 = 1; + taskId = CreateTask(sub_80DC0F4, 20); + r4 = sub_80DBFFC(a); + r5 = sub_80DBFFC(a + b) - r4; + sub_80DBFC8(c); // unused return value + gTasks[taskId].data[0] = abs(r4); + gTasks[taskId].data[1] = r5; + if (r4 > 0 || (r4 == 0 && r5 > 0)) + gTasks[taskId].data[2] = 1; + else + gTasks[taskId].data[2] = -1; + gTasks[taskId].data[3] = c; + return taskId; +} + +#ifdef NONMATCHING + +void sub_80DC0F4(u8 taskId) +{ + u8 r7 = gTasks[taskId].data[3]; + s16 r3 = gTasks[taskId].data[0]; + s16 r1 = gTasks[taskId].data[1]; + + if (++gTasks[taskId].data[10] > 14) + { + u16 r6; + u8 r5; + u8 r10; + + gTasks[taskId].data[10] = 0; + if (gTasks[taskId].data[1] == 0) + { + DestroyTask(taskId); + gContestResources->field_14[r7].unk2_2 = 0; + return; + } + else if (r3 == 0) + { + if (r1 < 0) + { + r6 = sub_80DBFC8(r7) + 2; + gTasks[taskId].data[1]++; + } + else + { + r6 = sub_80DBFC8(r7); + gTasks[taskId].data[1]--; + } + r5 = gTasks[taskId].data[0]++; + } + else + { + if (gTasks[taskId].data[2] < 0) + { + if (r1 < 0) + { + r5 = gTasks[taskId].data[0]++; + gTasks[taskId].data[1]++; + r6 = sub_80DBFC8(r7) + 2; + } + else + { + r5 = --gTasks[taskId].data[0]; + r6 = 0; + gTasks[taskId].data[1]--; + } + } + else + { + if (r1 < 0) + { + r5 = --gTasks[taskId].data[0]; + r6 = 0; + gTasks[taskId].data[1]++; + } + else + { + r5 = gTasks[taskId].data[0]++; + gTasks[taskId].data[1]--; + r6 = sub_80DBFC8(r7); + } + } + } + + r10 = r5; + r1 = 0; + if (r5 > 7) + { + r1 = 1; + r5 -= 8; + } + + ContestBG_FillBoxWithTile(0, r6, r5 + 0x16, (gUnknown_02039F26[r7] * 5) + 2 + r3, 1, 1, 0x11); + if (r1 > 0) + { + PlaySE(SE_C_GAJI); + m4aMPlayImmInit(&gMPlayInfo_SE1); + m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256); + } + else + { + PlaySE(SE_BOO); + } + + if (r10 == 0 && r5 == 0 && r6 == 0) + gTasks[taskId].data[2] = -gTasks[taskId].data[2]; + } +} +#else +NAKED +void sub_80DC0F4(u8 taskId) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x10\n\ + lsls r0, 24\n\ + lsrs r7, r0, 24\n\ + ldr r1, =gTasks\n\ + lsls r0, r7, 2\n\ + adds r0, r7\n\ + lsls r0, 3\n\ + adds r4, r0, r1\n\ + ldrb r0, [r4, 0xE]\n\ + mov r9, r0\n\ + ldrh r3, [r4, 0x8]\n\ + ldrh r1, [r4, 0xA]\n\ + ldrh r0, [r4, 0x1C]\n\ + adds r0, 0x1\n\ + strh r0, [r4, 0x1C]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + cmp r0, 0xE\n\ + bgt _080DC126\n\ + b _080DC2A8\n\ +_080DC126:\n\ + movs r0, 0\n\ + strh r0, [r4, 0x1C]\n\ + ldrh r2, [r4, 0xA]\n\ + movs r5, 0xA\n\ + ldrsh r0, [r4, r5]\n\ + cmp r0, 0\n\ + bne _080DC15C\n\ + adds r0, r7, 0\n\ + bl DestroyTask\n\ + ldr r0, =gContestResources\n\ + ldr r0, [r0]\n\ + ldr r0, [r0, 0x14]\n\ + mov r2, r9\n\ + lsls r1, r2, 2\n\ + adds r1, r0\n\ + ldrb r2, [r1, 0x2]\n\ + movs r0, 0x5\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r1, 0x2]\n\ + b _080DC2A8\n\ + .pool\n\ +_080DC15C:\n\ + cmp r3, 0\n\ + bne _080DC1A4\n\ + lsls r0, r1, 16\n\ + mov r8, r0\n\ + cmp r0, 0\n\ + bge _080DC17A\n\ + mov r0, r9\n\ + bl sub_80DBFC8\n\ + adds r0, 0x2\n\ + lsls r0, 16\n\ + lsrs r6, r0, 16\n\ + ldrh r0, [r4, 0xA]\n\ + adds r0, 0x1\n\ + b _080DC188\n\ +_080DC17A:\n\ + mov r0, r9\n\ + bl sub_80DBFC8\n\ + lsls r0, 16\n\ + lsrs r6, r0, 16\n\ + ldrh r0, [r4, 0xA]\n\ + subs r0, 0x1\n\ +_080DC188:\n\ + strh r0, [r4, 0xA]\n\ + ldr r1, =gTasks\n\ + lsls r0, r7, 2\n\ + adds r0, r7\n\ + lsls r0, 3\n\ + adds r0, r1\n\ + ldrh r1, [r0, 0x8]\n\ + adds r2, r1, 0x1\n\ + strh r2, [r0, 0x8]\n\ + lsls r1, 24\n\ + lsrs r5, r1, 24\n\ + b _080DC210\n\ + .pool\n\ +_080DC1A4:\n\ + movs r3, 0xC\n\ + ldrsh r0, [r4, r3]\n\ + cmp r0, 0\n\ + bge _080DC1DE\n\ + lsls r0, r1, 16\n\ + mov r8, r0\n\ + cmp r0, 0\n\ + bge _080DC1CC\n\ + ldrh r0, [r4, 0x8]\n\ + adds r1, r0, 0x1\n\ + strh r1, [r4, 0x8]\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + adds r0, r2, 0x1\n\ + strh r0, [r4, 0xA]\n\ + mov r0, r9\n\ + bl sub_80DBFC8\n\ + adds r0, 0x2\n\ + b _080DC20C\n\ +_080DC1CC:\n\ + ldrh r0, [r4, 0x8]\n\ + subs r0, 0x1\n\ + strh r0, [r4, 0x8]\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + movs r6, 0\n\ + subs r0, r2, 0x1\n\ + strh r0, [r4, 0xA]\n\ + b _080DC210\n\ +_080DC1DE:\n\ + lsls r0, r1, 16\n\ + mov r8, r0\n\ + cmp r0, 0\n\ + bge _080DC1F8\n\ + ldrh r0, [r4, 0x8]\n\ + subs r0, 0x1\n\ + strh r0, [r4, 0x8]\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + movs r6, 0\n\ + adds r0, r2, 0x1\n\ + strh r0, [r4, 0xA]\n\ + b _080DC210\n\ +_080DC1F8:\n\ + ldrh r0, [r4, 0x8]\n\ + adds r1, r0, 0x1\n\ + strh r1, [r4, 0x8]\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + subs r0, r2, 0x1\n\ + strh r0, [r4, 0xA]\n\ + mov r0, r9\n\ + bl sub_80DBFC8\n\ +_080DC20C:\n\ + lsls r0, 16\n\ + lsrs r6, r0, 16\n\ +_080DC210:\n\ + str r5, [sp, 0xC]\n\ + movs r0, 0\n\ + mov r10, r0\n\ + cmp r5, 0x7\n\ + bls _080DC226\n\ + movs r2, 0x1\n\ + mov r10, r2\n\ + adds r0, r5, 0\n\ + subs r0, 0x8\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ +_080DC226:\n\ + adds r2, r5, 0\n\ + adds r2, 0x16\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + ldr r0, =gUnknown_02039F26\n\ + add r0, r9\n\ + ldrb r0, [r0]\n\ + lsls r3, r0, 2\n\ + adds r3, r0\n\ + adds r3, 0x2\n\ + add r3, r10\n\ + lsls r3, 24\n\ + lsrs r3, 24\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + str r0, [sp, 0x4]\n\ + movs r0, 0x11\n\ + str r0, [sp, 0x8]\n\ + movs r0, 0\n\ + adds r1, r6, 0\n\ + bl ContestBG_FillBoxWithTile\n\ + mov r3, r8\n\ + cmp r3, 0\n\ + ble _080DC284\n\ + movs r0, 0x60\n\ + bl PlaySE\n\ + ldr r4, =gMPlayInfo_SE1\n\ + adds r0, r4, 0\n\ + bl m4aMPlayImmInit\n\ + ldr r1, =0x0000ffff\n\ + ldr r0, [sp, 0xC]\n\ + lsls r2, r0, 24\n\ + asrs r2, 16\n\ + adds r0, r4, 0\n\ + bl m4aMPlayPitchControl\n\ + b _080DC28A\n\ + .pool\n\ +_080DC284:\n\ + movs r0, 0x16\n\ + bl PlaySE\n\ +_080DC28A:\n\ + mov r2, r10\n\ + cmp r2, 0\n\ + bne _080DC2A8\n\ + cmp r5, 0\n\ + bne _080DC2A8\n\ + cmp r6, 0\n\ + bne _080DC2A8\n\ + ldr r0, =gTasks\n\ + lsls r1, r7, 2\n\ + adds r1, r7\n\ + lsls r1, 3\n\ + adds r1, r0\n\ + ldrh r0, [r1, 0xC]\n\ + negs r0, r0\n\ + strh r0, [r1, 0xC]\n\ +_080DC2A8:\n\ + add sp, 0x10\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided\n"); +} +#endif \ No newline at end of file From 2ca482dc24accca6bbb808f2c4b847e1d2c2dfac Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 24 Dec 2018 15:10:36 -0800 Subject: [PATCH 03/42] Committing progress so far. --- asm/contest.s | 1078 ------------------------------------------------ include/util.h | 2 + src/contest.c | 582 +++++++++++++++----------- 3 files changed, 341 insertions(+), 1321 deletions(-) diff --git a/asm/contest.s b/asm/contest.s index ebded2d2fc..f5ca016df1 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -5,1084 +5,6 @@ .text - thumb_func_start sub_80DC2BC -sub_80DC2BC: @ 80DC2BC - push {r4,r5,lr} - ldr r0, =gUnknown_08587A74 - bl LoadSpriteSheet - movs r4, 0 - ldr r5, =gUnknown_08587A6C -_080DC2C8: - ldr r0, =gUnknown_02039F26 - adds r0, r4, r0 - ldrb r0, [r0] - adds r0, r5 - ldrb r2, [r0] - ldr r0, =gSpriteTemplate_8587AD0 - movs r1, 0xB4 - movs r3, 0x1 - bl CreateSprite - ldr r1, =gContestResources - ldr r1, [r1] - ldr r2, [r1, 0x14] - lsls r1, r4, 2 - adds r1, r2 - strb r0, [r1] - adds r4, 0x1 - cmp r4, 0x3 - ble _080DC2C8 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC2BC - - thumb_func_start sub_80DC308 -sub_80DC308: @ 80DC308 - push {r4-r7,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r4, =gContestResources - ldr r0, [r4] - ldr r2, [r0, 0x14] - lsls r3, r6, 2 - adds r2, r3, r2 - ldrb r0, [r2, 0x2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x2] - ldr r1, [r4] - ldr r0, [r1, 0x14] - adds r3, r0 - ldrb r7, [r3] - ldr r1, [r1, 0x4] - lsls r0, r6, 3 - subs r0, r6 - lsls r0, 2 - adds r0, r1 - movs r1, 0x4 - ldrsh r0, [r0, r1] - movs r1, 0xA - bl __divsi3 - lsls r0, 17 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x38 - ble _080DC350 - movs r5, 0x38 - b _080DC356 - .pool -_080DC350: - cmp r0, 0 - bge _080DC356 - movs r5, 0 -_080DC356: - ldr r2, =gSprites - lsls r3, r7, 4 - adds r0, r3, r7 - lsls r0, 2 - adds r4, r0, r2 - movs r0, 0x3E - adds r0, r4 - mov r12, r0 - ldrb r1, [r0] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - mov r1, r12 - strb r0, [r1] - strh r6, [r4, 0x2E] - strh r5, [r4, 0x30] - lsls r0, r5, 16 - asrs r0, 16 - movs r5, 0x24 - ldrsh r1, [r4, r5] - cmp r0, r1 - ble _080DC38C - movs r0, 0x1 - b _080DC38E - .pool -_080DC38C: - ldr r0, =0x0000ffff -_080DC38E: - strh r0, [r4, 0x32] - adds r0, r3, r7 - lsls r0, 2 - adds r1, r2, 0 - adds r1, 0x1C - adds r0, r1 - ldr r1, =sub_80DC408 - str r1, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC308 - - thumb_func_start sub_80DC3AC -sub_80DC3AC: @ 80DC3AC - push {r4,lr} - movs r4, 0 -_080DC3B0: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80DC308 - adds r4, 0x1 - cmp r4, 0x3 - ble _080DC3B0 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DC3AC - - thumb_func_start sub_80DC3C4 -sub_80DC3C4: @ 80DC3C4 - push {r4,lr} - movs r2, 0 - ldr r3, =gContestResources - ldr r0, [r3] - ldr r0, [r0, 0x14] - ldrb r1, [r0, 0x2] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080DC3F2 - movs r4, 0x1 -_080DC3DA: - adds r2, 0x1 - cmp r2, 0x3 - bgt _080DC3F2 - ldr r0, [r3] - ldr r1, [r0, 0x14] - lsls r0, r2, 2 - adds r0, r1 - ldrb r1, [r0, 0x2] - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - beq _080DC3DA -_080DC3F2: - cmp r2, 0x4 - beq _080DC400 - movs r0, 0 - b _080DC402 - .pool -_080DC400: - movs r0, 0x1 -_080DC402: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80DC3C4 - - thumb_func_start sub_80DC408 -sub_80DC408: @ 80DC408 - push {r4,lr} - adds r3, r0, 0 - ldrh r2, [r3, 0x24] - movs r0, 0x24 - ldrsh r1, [r3, r0] - movs r4, 0x30 - ldrsh r0, [r3, r4] - cmp r1, r0 - bne _080DC440 - ldr r0, =gContestResources - ldr r0, [r0] - movs r2, 0x2E - ldrsh r1, [r3, r2] - ldr r0, [r0, 0x14] - lsls r1, 2 - adds r1, r0 - ldrb r2, [r1, 0x2] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x2] - ldr r0, =SpriteCallbackDummy - str r0, [r3, 0x1C] - b _080DC446 - .pool -_080DC440: - ldrh r0, [r3, 0x32] - adds r0, r2, r0 - strh r0, [r3, 0x24] -_080DC446: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DC408 - - thumb_func_start sub_80DC44C -sub_80DC44C: @ 80DC44C - push {r4-r6,lr} - movs r2, 0 - ldr r6, =gSprites - ldr r5, =gContestResources - ldr r4, =gUnknown_08587A6C - ldr r3, =gUnknown_02039F26 -_080DC458: - ldr r0, [r5] - ldr r1, [r0, 0x14] - lsls r0, r2, 2 - adds r0, r1 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - adds r0, r2, r3 - ldrb r0, [r0] - adds r0, r4 - ldrb r0, [r0] - strh r0, [r1, 0x22] - adds r2, 0x1 - cmp r2, 0x3 - ble _080DC458 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC44C - - thumb_func_start sub_80DC490 -sub_80DC490: @ 80DC490 - push {r4-r7,lr} - lsls r0, 24 - lsrs r6, r0, 24 - movs r3, 0 - ldr r7, =gUnknown_02039F26 - ldr r5, =gSprites - ldr r4, =gContestResources - movs r2, 0 -_080DC4A0: - adds r0, r3, r7 - ldrb r0, [r0] - cmp r0, 0x1 - bls _080DC4E2 - cmp r6, 0 - bne _080DC4CC - ldr r0, [r4] - ldr r0, [r0, 0x14] - adds r0, r2, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - movs r1, 0xB4 - b _080DC4E0 - .pool -_080DC4CC: - ldr r0, [r4] - ldr r0, [r0, 0x14] - adds r0, r2, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - movs r1, 0x80 - lsls r1, 1 -_080DC4E0: - strh r1, [r0, 0x20] -_080DC4E2: - adds r2, 0x4 - adds r3, 0x1 - cmp r3, 0x3 - ble _080DC4A0 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80DC490 - - thumb_func_start sub_80DC4F0 -sub_80DC4F0: @ 80DC4F0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, =gUnknown_08587B08 - bl LoadSpritePalette - movs r5, 0 - ldr r7, =gContestResources - ldr r0, =gSprites - mov r8, r0 - movs r6, 0 -_080DC506: - lsls r0, r5, 3 - ldr r1, =gUnknown_08587AE8 - adds r0, r1 - bl LoadCompressedSpriteSheet - ldr r0, =gSpriteTemplate_8587B18 - adds r0, r6, r0 - ldr r2, =gUnknown_08587A70 - ldr r1, =gUnknown_02039F26 - adds r1, r5, r1 - ldrb r1, [r1] - adds r1, r2 - ldrb r2, [r1] - movs r1, 0xCC - movs r3, 0 - bl CreateSprite - ldr r1, [r7] - ldr r1, [r1, 0x14] - lsls r4, r5, 2 - adds r1, r4, r1 - strb r0, [r1, 0x1] - ldr r0, [r7] - ldr r0, [r0, 0x14] - adds r0, r4, r0 - ldrb r1, [r0, 0x1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - ldr r1, =gSubspriteTables_8587B80 - bl SetSubspriteTables - ldr r0, [r7] - ldr r0, [r0, 0x14] - adds r4, r0 - ldrb r1, [r4, 0x1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - adds r6, 0x18 - adds r5, 0x1 - cmp r5, 0x3 - ble _080DC506 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC4F0 - - thumb_func_start sub_80DC594 -sub_80DC594: @ 80DC594 - push {lr} - ldr r0, =gUnknown_08587BB0 - bl LoadCompressedSpriteSheet - ldr r0, =gUnknown_08587BB8 - bl LoadSpritePalette - ldr r0, =gSpriteTemplate_8587BC8 - movs r1, 0x1E - movs r2, 0x2C - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r2, [r1] - movs r3, 0x4 - orrs r2, r3 - strb r2, [r1] - ldr r1, =gContestResources - ldr r1, [r1] - ldr r1, [r1] - adds r1, 0x58 - strb r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC594 - - thumb_func_start sub_80DC5E8 -sub_80DC5E8: @ 80DC5E8 - push {r4,lr} - ldr r0, =sub_80DC728 - movs r1, 0x1E - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gContestResources - ldr r1, [r1] - ldr r1, [r1] - strb r0, [r1, 0xD] - movs r2, 0 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r4, =gTasks + 0x8 - movs r3, 0xFF -_080DC60A: - lsls r0, r2, 3 - adds r0, r1 - adds r0, r4 - strh r3, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _080DC60A - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC5E8 - - thumb_func_start sub_80DC630 -sub_80DC630: @ 80DC630 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gTasks - ldr r1, =gContestResources - ldr r5, [r1] - ldr r1, [r5] - ldrb r2, [r1, 0xD] - lsls r1, r2, 2 - adds r1, r2 - adds r1, r0 - lsls r1, 3 - adds r3, 0x8 - adds r1, r3 - movs r4, 0 - strh r4, [r1] - lsls r0, 2 - adds r0, 0x1 - lsls r0, 1 - ldr r1, [r5] - ldrb r2, [r1, 0xD] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r0, r1 - adds r0, r3 - strh r4, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC630 - - thumb_func_start sub_80DC674 -sub_80DC674: @ 80DC674 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =sub_80DC6A4 - movs r1, 0x1F - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0x8] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC674 - - thumb_func_start sub_80DC6A4 -sub_80DC6A4: @ 80DC6A4 - push {r4-r7,lr} - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - ldr r2, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x8] - adds r5, r0, 0 - ldr r0, =gContestResources - ldr r4, [r0] - ldr r0, [r4] - ldrb r1, [r0, 0xD] - lsls r0, r1, 2 - adds r0, r1 - adds r0, r5 - lsls r0, 3 - adds r7, r2, 0 - adds r7, 0x8 - adds r1, r0, r7 - movs r2, 0 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _080DC6DC - cmp r0, 0xFF - bne _080DC716 -_080DC6DC: - movs r3, 0 - movs r0, 0xFF - strh r0, [r1] - lsls r1, r5, 2 - adds r1, 0x1 - lsls r1, 1 - ldr r0, [r4] - ldrb r2, [r0, 0xD] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - adds r1, r7 - strh r3, [r1] - ldr r0, [r4] - adds r0, 0x14 - adds r0, r5 - ldrb r0, [r0] - adds r0, 0x5 - lsls r0, 4 - adds r0, 0x6 - ldr r3, =0x00004bff - movs r1, 0x2 - movs r2, 0 - bl BlendPalette - adds r0, r6, 0 - bl DestroyTask -_080DC716: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC6A4 - - thumb_func_start sub_80DC728 -sub_80DC728: @ 80DC728 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - movs r6, 0 - lsls r1, r0, 2 - adds r1, r0 - mov r9, r1 - lsls r7, r1, 3 - ldr r0, =gTasks + 0x8 - mov r8, r0 - movs r1, 0x8 - negs r1, r1 - add r1, r8 - mov r10, r1 -_080DC74C: - lsls r0, r6, 26 - lsrs r3, r0, 24 - lsls r0, r3, 1 - adds r0, r7 - mov r4, r8 - adds r2, r0, r4 - ldrh r4, [r2] - movs r5, 0 - ldrsh r0, [r2, r5] - cmp r0, 0xFF - beq _080DC7CA - adds r0, r3, 0x1 - lsls r1, r0, 1 - adds r1, r7 - add r1, r8 - movs r5, 0 - ldrsh r1, [r1, r5] - adds r5, r0, 0 - cmp r1, 0 - bne _080DC77C - adds r0, r4, 0x1 - b _080DC77E - .pool -_080DC77C: - subs r0, r4, 0x1 -_080DC77E: - strh r0, [r2] - lsls r1, r3, 1 - mov r0, r9 - lsls r2, r0, 3 - adds r0, r1, r2 - mov r3, r10 - adds r3, 0x8 - adds r0, r3 - movs r4, 0 - ldrsh r0, [r0, r4] - adds r4, r1, 0 - cmp r0, 0x10 - beq _080DC79C - cmp r0, 0 - bne _080DC7AA -_080DC79C: - lsls r0, r5, 1 - adds r0, r2 - adds r0, r3 - ldrh r1, [r0] - movs r2, 0x1 - eors r1, r2 - strh r1, [r0] -_080DC7AA: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - adds r0, 0x14 - adds r0, r6 - ldrb r0, [r0] - adds r0, 0x5 - lsls r0, 4 - adds r0, 0x6 - adds r1, r4, r7 - add r1, r8 - ldrb r2, [r1] - movs r1, 0x2 - ldr r3, =0x00004bff - bl BlendPalette -_080DC7CA: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _080DC74C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC728 - - thumb_func_start sub_80DC7EC -sub_80DC7EC: @ 80DC7EC - push {r4,lr} - ldr r0, =sub_80DC8D0 - movs r1, 0x1E - bl CreateTask - ldr r1, =gContestResources - ldr r1, [r1] - ldr r1, [r1] - strb r0, [r1, 0xE] - movs r4, 0 -_080DC800: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80DC81C - adds r4, 0x1 - cmp r4, 0x3 - ble _080DC800 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC7EC - - thumb_func_start sub_80DC81C -sub_80DC81C: @ 80DC81C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gTasks - ldr r1, =gContestResources - ldr r4, [r1] - ldr r1, [r4] - ldrb r2, [r1, 0xE] - lsls r1, r2, 2 - adds r1, r2 - adds r1, r0 - lsls r1, 3 - adds r3, 0x8 - adds r1, r3 - movs r5, 0 - movs r2, 0xFF - strh r2, [r1] - lsls r0, 2 - adds r0, 0x1 - lsls r0, 1 - ldr r1, [r4] - ldrb r2, [r1, 0xE] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r0, r1 - adds r0, r3 - strh r5, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC81C - - thumb_func_start sub_80DC864 -sub_80DC864: @ 80DC864 - push {r4,lr} - movs r4, 0 -_080DC868: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80DC87C - adds r4, 0x1 - cmp r4, 0x3 - ble _080DC868 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DC864 - - thumb_func_start sub_80DC87C -sub_80DC87C: @ 80DC87C - push {r4-r6,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl sub_80DC81C - adds r0, r4, 0x5 - lsls r2, r0, 5 - ldr r3, =gPlttBufferUnfaded + 0x14 - adds r6, r2, r3 - ldr r5, =gPlttBufferFaded + 0x14 - adds r2, r5 - ldr r1, =0x040000d4 - str r6, [r1] - str r2, [r1, 0x4] - ldr r2, =0x80000001 - str r2, [r1, 0x8] - ldr r6, [r1, 0x8] - lsls r0, 4 - adds r4, 0xC - adds r0, r4 - lsls r0, 1 - subs r3, 0x14 - adds r3, r0, r3 - subs r5, 0x14 - adds r0, r5 - str r3, [r1] - str r0, [r1, 0x4] - str r2, [r1, 0x8] - ldr r0, [r1, 0x8] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC87C - - thumb_func_start sub_80DC8D0 -sub_80DC8D0: @ 80DC8D0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - movs r7, 0 - lsls r1, r0, 2 - adds r1, r0 - mov r9, r1 - lsls r6, r1, 3 - ldr r0, =gTasks + 0x8 - mov r8, r0 - ldr r1, =0x00004bff - mov r10, r1 -_080DC8F0: - lsls r0, r7, 26 - lsrs r3, r0, 24 - lsls r0, r3, 1 - adds r0, r6 - mov r4, r8 - adds r2, r0, r4 - movs r5, 0 - ldrsh r0, [r2, r5] - cmp r0, 0xFF - beq _080DC996 - adds r0, r3, 0x2 - lsls r0, 1 - adds r0, r6 - adds r1, r0, r4 - ldrh r0, [r1] - adds r0, 0x1 - movs r4, 0 - strh r0, [r1] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _080DC996 - strh r4, [r1] - adds r0, r3, 0x1 - lsls r1, r0, 1 - adds r1, r6 - add r1, r8 - movs r4, 0 - ldrsh r1, [r1, r4] - adds r4, r0, 0 - cmp r1, 0 - bne _080DC940 - ldrh r0, [r2] - adds r0, 0x1 - b _080DC944 - .pool -_080DC940: - ldrh r0, [r2] - subs r0, 0x1 -_080DC944: - strh r0, [r2] - lsls r1, r3, 1 - mov r5, r9 - lsls r2, r5, 3 - adds r0, r1, r2 - ldr r3, =gTasks - adds r3, 0x8 - adds r0, r3 - movs r5, 0 - ldrsh r0, [r0, r5] - adds r5, r1, 0 - cmp r0, 0x10 - beq _080DC962 - cmp r0, 0 - bne _080DC970 -_080DC962: - lsls r0, r4, 1 - adds r0, r2 - adds r0, r3 - ldrh r1, [r0] - movs r2, 0x1 - eors r1, r2 - strh r1, [r0] -_080DC970: - adds r4, r7, 0x5 - lsls r4, 4 - adds r0, r4, 0 - adds r0, 0xA - adds r5, r6 - add r5, r8 - ldrb r2, [r5] - movs r1, 0x1 - mov r3, r10 - bl BlendPalette - adds r4, 0xC - adds r4, r7 - ldrb r2, [r5] - adds r0, r4, 0 - movs r1, 0x1 - mov r3, r10 - bl BlendPalette -_080DC996: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x3 - bls _080DC8F0 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DC8D0 - - thumb_func_start sub_80DC9B4 -sub_80DC9B4: @ 80DC9B4 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r1, [r0, 0x4] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x15] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080DC9E0 - adds r0, r2, 0 - bl sub_80DC630 - b _080DC9E6 - .pool -_080DC9E0: - adds r0, r2, 0 - bl sub_80DC674 -_080DC9E6: - pop {r0} - bx r0 - thumb_func_end sub_80DC9B4 - - thumb_func_start sub_80DC9EC -sub_80DC9EC: @ 80DC9EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0xC] - ldr r6, =gUnknown_02039F26 - adds r6, r0, r6 - ldrb r0, [r6] - lsls r5, r0, 2 - adds r5, r0 - lsls r5, 27 - movs r0, 0x80 - lsls r0, 22 - adds r5, r0 - lsrs r5, 24 - ldr r1, [sp, 0xC] - lsls r4, r1, 3 - ldr r0, =gUnknown_08589904 - adds r0, r4, r0 - bl LoadCompressedSpriteSheet - ldr r0, =gUnknown_08589924 - adds r4, r0 - adds r0, r4, 0 - bl LoadSpritePalette - ldr r2, [sp, 0xC] - lsls r4, r2, 1 - adds r4, r2 - lsls r4, 3 - ldr r0, =gSpriteTemplate_858998C - adds r4, r0 - adds r0, r4, 0 - movs r1, 0xB8 - adds r2, r5, 0 - movs r3, 0x1D - bl CreateSprite - mov r9, r0 - mov r3, r9 - lsls r3, 24 - lsrs r3, 24 - mov r9, r3 - adds r0, r4, 0 - movs r1, 0xF8 - adds r2, r5, 0 - movs r3, 0x1D - bl CreateSprite - mov r8, r0 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r5, r0, 4 - add r5, r8 - lsls r5, 2 - ldr r1, =gSprites - adds r5, r1 - ldrh r2, [r5, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - adds r1, 0x40 - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r1, r0 - ldr r0, =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r5, 0x4] - movs r4, 0xC0 - lsls r4, 19 - ldrb r0, [r6] - lsls r3, r0, 2 - adds r3, r0 - lsls r3, 6 - ldr r0, =0x0600e026 - adds r3, r0 - ldr r7, =gContestResources - ldr r0, [r7] - ldr r0, [r0, 0x34] - str r0, [sp] - movs r0, 0 - movs r1, 0x3 - adds r2, r4, 0 - bl CopySpriteTiles - ldrb r0, [r6] - lsls r3, r0, 2 - adds r3, r0 - lsls r3, 6 - ldr r1, =0x0600e036 - adds r3, r1 - ldr r0, [r7] - ldr r0, [r0, 0x38] - str r0, [sp] - movs r0, 0 - movs r1, 0x3 - adds r2, r4, 0 - bl CopySpriteTiles - movs r4, 0 - str r4, [sp, 0x4] - ldr r0, [r7] - ldr r1, [r0, 0x34] - movs r6, 0xA0 - lsls r6, 3 - adds r1, r6 - ldr r2, =0x050000c0 - mov r10, r2 - add r0, sp, 0x4 - bl CpuSet - str r4, [sp, 0x8] - add r0, sp, 0x8 - ldr r1, [r7] - ldr r1, [r1, 0x38] - adds r1, r6 - mov r2, r10 - bl CpuSet - ldr r0, [r7] - ldr r0, [r0, 0x34] - mov r3, r9 - lsls r4, r3, 4 - add r4, r9 - lsls r4, 2 - ldr r1, =gSprites - adds r4, r1 - ldrh r1, [r4, 0x4] - lsls r1, 22 - lsrs r1, 17 - ldr r6, =0x06010000 - adds r1, r6 - movs r2, 0x80 - lsls r2, 4 - mov r10, r2 - movs r3, 0x1 - bl RequestDma3Copy - ldr r0, [r7] - ldr r0, [r0, 0x38] - ldrh r1, [r5, 0x4] - lsls r1, 22 - lsrs r1, 17 - adds r1, r6 - mov r2, r10 - movs r3, 0x1 - bl RequestDma3Copy - mov r3, r8 - strh r3, [r4, 0x2E] - mov r0, r9 - strh r0, [r5, 0x2E] - mov r1, sp - ldrh r1, [r1, 0xC] - strh r1, [r4, 0x30] - mov r2, sp - ldrh r2, [r2, 0xC] - strh r2, [r5, 0x30] - mov r0, r9 - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DC9EC - thumb_func_start sub_80DCB78 sub_80DCB78: @ 80DCB78 push {r4,r5,lr} diff --git a/include/util.h b/include/util.h index 9d13453c20..56c89359aa 100644 --- a/include/util.h +++ b/include/util.h @@ -15,5 +15,7 @@ u16 CalcCRC16WithTable(u8 *data, u32 length); u32 CalcByteArraySum(const u8* data, u32 length); void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha); +void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output); + #endif // GUARD_UTIL_H diff --git a/src/contest.c b/src/contest.c index 4fb5f76c57..a0b44e331e 100644 --- a/src/contest.c +++ b/src/contest.c @@ -113,7 +113,7 @@ void sub_80DBF90(void); void sub_80DC2BC(void); void sub_80DC490(bool8); void sub_80DC4F0(void); -void sub_80DC594(void); +void CreateApplauseMeterSprite(void); void sub_80DC5E8(void); void sub_80DC7EC(void); void sub_80DCD48(void); @@ -174,6 +174,14 @@ s16 sub_80DBD34(u8); void DetermineFinalStandings(void); bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *); void sub_80DC0F4(u8); +void sub_80DC408(struct Sprite *); +void sub_80DC728(u8); +void sub_80DC6A4(u8); +void sub_80DC8D0(u8); +void sub_80DC81C(u8); +void sub_80DC87C(u8); + + EWRAM_DATA struct ContestPokemon gContestMons[4] = {0}; EWRAM_DATA s16 gContestMonConditions[4] = {0}; @@ -230,6 +238,17 @@ extern const struct SpriteTemplate gSpriteTemplate_8587C18; extern const union AffineAnimCmd *const gUnknown_082FF6C0[]; extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const u8 *const gContestEffectDescriptionPointers[]; +extern const struct SpriteSheet gUnknown_08587A74; +extern const u8 gUnknown_08587A6C[]; +extern const struct SpriteTemplate gSpriteTemplate_8587AD0; +extern const struct SpritePalette gUnknown_08587B08; +extern const struct CompressedSpriteSheet gUnknown_08587AE8[]; +extern const struct SpriteTemplate gSpriteTemplate_8587B18[]; +extern const u8 gUnknown_08587A70[]; +extern const struct SubspriteTable gSubspriteTables_8587B80[]; +extern const struct CompressedSpriteSheet gUnknown_08587BB0; +extern const struct SpritePalette gUnknown_08587BB8; +extern const struct SpriteTemplate gSpriteTemplate_8587BC8; void TaskDummy1(u8 taskId) { @@ -577,7 +596,7 @@ u8 sub_80D7E44(u8 *a) gContestResources->field_0->unk19216 = sub_80DB120(); sub_80DC2BC(); sub_80DC4F0(); - sub_80DC594(); + CreateApplauseMeterSprite(); sub_80DC5E8(); sub_80DC7EC(); gBattlerPositions[0] = 0; @@ -3090,8 +3109,6 @@ u8 sub_80DC028(s16 a, s16 b, u8 c) return taskId; } -#ifdef NONMATCHING - void sub_80DC0F4(u8 taskId) { u8 r7 = gTasks[taskId].data[3]; @@ -3103,7 +3120,8 @@ void sub_80DC0F4(u8 taskId) u16 r6; u8 r5; u8 r10; - + u8 r11; + gTasks[taskId].data[10] = 0; if (gTasks[taskId].data[1] == 0) { @@ -3158,16 +3176,15 @@ void sub_80DC0F4(u8 taskId) } } } - - r10 = r5; - r1 = 0; + r10 = r5; + r11 = 0; + if (r5 > 7) - { - r1 = 1; - r5 -= 8; + { + r11 = 1; + r5-= 8; } - - ContestBG_FillBoxWithTile(0, r6, r5 + 0x16, (gUnknown_02039F26[r7] * 5) + 2 + r3, 1, 1, 0x11); + ContestBG_FillBoxWithTile(0, r6, r5 + 22, gUnknown_02039F26[r7] * 5 + 2 + r11, 1, 1, 17); if (r1 > 0) { PlaySE(SE_C_GAJI); @@ -3175,239 +3192,318 @@ void sub_80DC0F4(u8 taskId) m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256); } else - { PlaySE(SE_BOO); - } - - if (r10 == 0 && r5 == 0 && r6 == 0) + + if (!r11 && !r5 && !r6) gTasks[taskId].data[2] = -gTasks[taskId].data[2]; } } -#else -NAKED -void sub_80DC0F4(u8 taskId) + +void sub_80DC2BC(void) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x10\n\ - lsls r0, 24\n\ - lsrs r7, r0, 24\n\ - ldr r1, =gTasks\n\ - lsls r0, r7, 2\n\ - adds r0, r7\n\ - lsls r0, 3\n\ - adds r4, r0, r1\n\ - ldrb r0, [r4, 0xE]\n\ - mov r9, r0\n\ - ldrh r3, [r4, 0x8]\n\ - ldrh r1, [r4, 0xA]\n\ - ldrh r0, [r4, 0x1C]\n\ - adds r0, 0x1\n\ - strh r0, [r4, 0x1C]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - cmp r0, 0xE\n\ - bgt _080DC126\n\ - b _080DC2A8\n\ -_080DC126:\n\ - movs r0, 0\n\ - strh r0, [r4, 0x1C]\n\ - ldrh r2, [r4, 0xA]\n\ - movs r5, 0xA\n\ - ldrsh r0, [r4, r5]\n\ - cmp r0, 0\n\ - bne _080DC15C\n\ - adds r0, r7, 0\n\ - bl DestroyTask\n\ - ldr r0, =gContestResources\n\ - ldr r0, [r0]\n\ - ldr r0, [r0, 0x14]\n\ - mov r2, r9\n\ - lsls r1, r2, 2\n\ - adds r1, r0\n\ - ldrb r2, [r1, 0x2]\n\ - movs r0, 0x5\n\ - negs r0, r0\n\ - ands r0, r2\n\ - strb r0, [r1, 0x2]\n\ - b _080DC2A8\n\ - .pool\n\ -_080DC15C:\n\ - cmp r3, 0\n\ - bne _080DC1A4\n\ - lsls r0, r1, 16\n\ - mov r8, r0\n\ - cmp r0, 0\n\ - bge _080DC17A\n\ - mov r0, r9\n\ - bl sub_80DBFC8\n\ - adds r0, 0x2\n\ - lsls r0, 16\n\ - lsrs r6, r0, 16\n\ - ldrh r0, [r4, 0xA]\n\ - adds r0, 0x1\n\ - b _080DC188\n\ -_080DC17A:\n\ - mov r0, r9\n\ - bl sub_80DBFC8\n\ - lsls r0, 16\n\ - lsrs r6, r0, 16\n\ - ldrh r0, [r4, 0xA]\n\ - subs r0, 0x1\n\ -_080DC188:\n\ - strh r0, [r4, 0xA]\n\ - ldr r1, =gTasks\n\ - lsls r0, r7, 2\n\ - adds r0, r7\n\ - lsls r0, 3\n\ - adds r0, r1\n\ - ldrh r1, [r0, 0x8]\n\ - adds r2, r1, 0x1\n\ - strh r2, [r0, 0x8]\n\ - lsls r1, 24\n\ - lsrs r5, r1, 24\n\ - b _080DC210\n\ - .pool\n\ -_080DC1A4:\n\ - movs r3, 0xC\n\ - ldrsh r0, [r4, r3]\n\ - cmp r0, 0\n\ - bge _080DC1DE\n\ - lsls r0, r1, 16\n\ - mov r8, r0\n\ - cmp r0, 0\n\ - bge _080DC1CC\n\ - ldrh r0, [r4, 0x8]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r4, 0x8]\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - adds r0, r2, 0x1\n\ - strh r0, [r4, 0xA]\n\ - mov r0, r9\n\ - bl sub_80DBFC8\n\ - adds r0, 0x2\n\ - b _080DC20C\n\ -_080DC1CC:\n\ - ldrh r0, [r4, 0x8]\n\ - subs r0, 0x1\n\ - strh r0, [r4, 0x8]\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - movs r6, 0\n\ - subs r0, r2, 0x1\n\ - strh r0, [r4, 0xA]\n\ - b _080DC210\n\ -_080DC1DE:\n\ - lsls r0, r1, 16\n\ - mov r8, r0\n\ - cmp r0, 0\n\ - bge _080DC1F8\n\ - ldrh r0, [r4, 0x8]\n\ - subs r0, 0x1\n\ - strh r0, [r4, 0x8]\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - movs r6, 0\n\ - adds r0, r2, 0x1\n\ - strh r0, [r4, 0xA]\n\ - b _080DC210\n\ -_080DC1F8:\n\ - ldrh r0, [r4, 0x8]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r4, 0x8]\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - subs r0, r2, 0x1\n\ - strh r0, [r4, 0xA]\n\ - mov r0, r9\n\ - bl sub_80DBFC8\n\ -_080DC20C:\n\ - lsls r0, 16\n\ - lsrs r6, r0, 16\n\ -_080DC210:\n\ - str r5, [sp, 0xC]\n\ - movs r0, 0\n\ - mov r10, r0\n\ - cmp r5, 0x7\n\ - bls _080DC226\n\ - movs r2, 0x1\n\ - mov r10, r2\n\ - adds r0, r5, 0\n\ - subs r0, 0x8\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ -_080DC226:\n\ - adds r2, r5, 0\n\ - adds r2, 0x16\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - ldr r0, =gUnknown_02039F26\n\ - add r0, r9\n\ - ldrb r0, [r0]\n\ - lsls r3, r0, 2\n\ - adds r3, r0\n\ - adds r3, 0x2\n\ - add r3, r10\n\ - lsls r3, 24\n\ - lsrs r3, 24\n\ - movs r0, 0x1\n\ - str r0, [sp]\n\ - str r0, [sp, 0x4]\n\ - movs r0, 0x11\n\ - str r0, [sp, 0x8]\n\ - movs r0, 0\n\ - adds r1, r6, 0\n\ - bl ContestBG_FillBoxWithTile\n\ - mov r3, r8\n\ - cmp r3, 0\n\ - ble _080DC284\n\ - movs r0, 0x60\n\ - bl PlaySE\n\ - ldr r4, =gMPlayInfo_SE1\n\ - adds r0, r4, 0\n\ - bl m4aMPlayImmInit\n\ - ldr r1, =0x0000ffff\n\ - ldr r0, [sp, 0xC]\n\ - lsls r2, r0, 24\n\ - asrs r2, 16\n\ - adds r0, r4, 0\n\ - bl m4aMPlayPitchControl\n\ - b _080DC28A\n\ - .pool\n\ -_080DC284:\n\ - movs r0, 0x16\n\ - bl PlaySE\n\ -_080DC28A:\n\ - mov r2, r10\n\ - cmp r2, 0\n\ - bne _080DC2A8\n\ - cmp r5, 0\n\ - bne _080DC2A8\n\ - cmp r6, 0\n\ - bne _080DC2A8\n\ - ldr r0, =gTasks\n\ - lsls r1, r7, 2\n\ - adds r1, r7\n\ - lsls r1, 3\n\ - adds r1, r0\n\ - ldrh r0, [r1, 0xC]\n\ - negs r0, r0\n\ - strh r0, [r1, 0xC]\n\ -_080DC2A8:\n\ - add sp, 0x10\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided\n"); + s32 i; + + LoadSpriteSheet(&gUnknown_08587A74); + for (i = 0; i < 4; i++) + { + u8 y = gUnknown_08587A6C[gUnknown_02039F26[i]]; + + gContestResources->field_14[i].unk0 = CreateSprite(&gSpriteTemplate_8587AD0, 180, y, 1); + } } -#endif \ No newline at end of file + +void sub_80DC308(u8 a) +{ + u8 spriteId; + s16 r5; + + gContestResources->field_14[a].unk2_0 = 1; + spriteId = gContestResources->field_14[a].unk0; + r5 = sContestantStatus[a].unk4 / 10 * 2; + if (r5 > 56) + r5 = 56; + else if (r5 < 0) + r5 = 0; + gSprites[spriteId].invisible = FALSE; + gSprites[spriteId].data[0] = a; + gSprites[spriteId].data[1] = r5; + if (gSprites[spriteId].data[1] > gSprites[spriteId].pos2.x) + gSprites[spriteId].data[2] = 1; + else + gSprites[spriteId].data[2] = -1; + gSprites[spriteId].callback = sub_80DC408; +} + +void sub_80DC3AC(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + sub_80DC308(i); +} + +bool8 sub_80DC3C4(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + if (gContestResources->field_14[i].unk2_0) + break; + } + if (i == 4) + return TRUE; + else + return FALSE; +} + +void sub_80DC408(struct Sprite *sprite) +{ + if (sprite->pos2.x == sprite->data[1]) + { + gContestResources->field_14[sprite->data[0]].unk2_0 = 0; + sprite->callback = SpriteCallbackDummy; + } + else + { + sprite->pos2.x += sprite->data[2]; + } +} + +void sub_80DC44C(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + gSprites[gContestResources->field_14[i].unk0].pos1.y = gUnknown_08587A6C[gUnknown_02039F26[i]]; +} + +void sub_80DC490(bool8 a) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + if (gUnknown_02039F26[i] > 1) + { + if (!a) + gSprites[gContestResources->field_14[i].unk0].pos1.x = 180; + else + gSprites[gContestResources->field_14[i].unk0].pos1.x = 256; + } + } +} + +void sub_80DC4F0(void) +{ + s32 i; + + LoadSpritePalette(&gUnknown_08587B08); + for (i = 0; i < 4; i++) + { + LoadCompressedObjectPic(&gUnknown_08587AE8[i]); + gContestResources->field_14[i].unk1 = CreateSprite( + &gSpriteTemplate_8587B18[i], + 204, gUnknown_08587A70[gUnknown_02039F26[i]], + 0); + SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80); + gSprites[gContestResources->field_14[i].unk1].invisible = TRUE; + } +} + +void CreateApplauseMeterSprite(void) +{ + u8 spriteId; + + LoadCompressedObjectPic(&gUnknown_08587BB0); + LoadSpritePalette(&gUnknown_08587BB8); + spriteId = CreateSprite(&gSpriteTemplate_8587BC8, 30, 44, 1); + gSprites[spriteId].invisible = TRUE; + sContest.applauseMeterSpriteId = spriteId; +} + +void sub_80DC5E8(void) +{ + u8 i; + u8 taskId = CreateTask(sub_80DC728, 30); + + sContest.unk19211 = taskId; + for (i = 0; i < 4; i++) + gTasks[taskId].data[i * 4] = 0xFF; +} + +void sub_80DC630(u8 a) +{ + gTasks[sContest.unk19211].data[a * 4 + 0] = 0; + gTasks[sContest.unk19211].data[a * 4 + 1] = 0; +} + +void sub_80DC674(u8 a) +{ + u8 taskId = CreateTask(sub_80DC6A4, 31); + + gTasks[taskId].data[0] = a; +} + +void sub_80DC6A4(u8 taskId) +{ + u8 r4 = gTasks[taskId].data[0]; + + if (gTasks[sContest.unk19211].data[r4 * 4 + 0] == 0 + || gTasks[sContest.unk19211].data[r4 * 4 + 0] == 0xFF) + { + gTasks[sContest.unk19211].data[r4 * 4 + 0] = 0xFF; + gTasks[sContest.unk19211].data[r4 * 4 + 1] = 0; + BlendPalette((sContest.unk19218[r4] + 5) * 16 + 6, 2, 0, RGB(31, 31, 18)); + DestroyTask(taskId); + } +} + +void sub_80DC728(u8 taskId) +{ + u8 i; + + for (i = 0; i < 4; i++) + { + u8 r3 = i * 4; + + if (gTasks[taskId].data[r3 + 0] != 0xFF) + { + if (gTasks[taskId].data[r3 + 1] == 0) + gTasks[taskId].data[r3 + 0]++; + else + gTasks[taskId].data[r3 + 0]--; + + if (gTasks[taskId].data[r3 + 0] == 16 + || gTasks[taskId].data[r3 + 0] == 0) + gTasks[taskId].data[r3 + 1] ^= 1; + + BlendPalette( + (sContest.unk19218[i] + 5) * 16 + 6, + 2, + gTasks[taskId].data[r3 + 0], + RGB(31, 31, 18)); + } + } +} + +void sub_80DC7EC(void) +{ + s32 i; + + sContest.unk19212 = CreateTask(sub_80DC8D0, 30); + for (i = 0; i < 4; i++) + sub_80DC81C(i); +} + +void sub_80DC81C(u8 a) +{ + gTasks[sContest.unk19212].data[a * 4 + 0] = 0xFF; + gTasks[sContest.unk19212].data[a * 4 + 1] = 0; +} + +void sub_80DC864(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + sub_80DC87C(i); +} + +void sub_80DC87C(u8 a) +{ + u32 var; + u32 r0; + + sub_80DC81C(a); + + r0 = a + 5; + DmaCopy16Defvars( + 3, + gPlttBufferUnfaded + r0 * 16 + 10, + gPlttBufferFaded + r0 * 16 + 10, + 2); + + var = (a + 5) * 16 + 12 + a; + DmaCopy16Defvars( + 3, + gPlttBufferUnfaded + var, + gPlttBufferFaded + var, + 2); +} + +void sub_80DC8D0(u8 taskId) +{ + u8 i; + + for (i = 0; i < 4; i++) + { + u8 r3 = i * 4; + + if (gTasks[taskId].data[r3 + 0] != 0xFF) + { + if (++gTasks[taskId].data[r3 + 2] > 2) + { + gTasks[taskId].data[r3 + 2] = 0; + + if (gTasks[taskId].data[r3 + 1] == 0) + gTasks[taskId].data[r3 + 0]++; + else + gTasks[taskId].data[r3 + 0]--; + + if (gTasks[taskId].data[r3 + 0] == 16 + || gTasks[taskId].data[r3 + 0] == 0) + gTasks[taskId].data[r3 + 1] ^= 1; + + BlendPalette((i + 5) * 16 + 10, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18)); + BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18)); + } + } + } +} + +void sub_80DC9B4(u8 a) +{ + if (sContestantStatus[a].hasJudgesAttention) + sub_80DC630(a); + else + sub_80DC674(a); +} + +extern const struct CompressedSpriteSheet gUnknown_08589904[]; +extern const struct SpritePalette gUnknown_08589924[]; +extern const struct SpriteTemplate gSpriteTemplate_858998C[]; + +u8 sub_80DC9EC(u8 a) +{ + u8 r5 = gUnknown_02039F26[a] * 40 + 32; + u8 r8; + u8 r6; + volatile u8 zero; + + + LoadCompressedObjectPic(&gUnknown_08589904[a]); + LoadSpritePalette(&gUnknown_08589924[a]); + r6 = CreateSprite(&gSpriteTemplate_858998C[a], 184, r5, 29); + gSprites[r8].oam.tileNum += 64; + r8 = CreateSprite(&gSpriteTemplate_858998C[a], 248, r5, 29); + + + CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x26), (u8 *)(VRAM + 0x10000 + gSprites[r6].oam.tileNum * 32)); + CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), (u8 *)(VRAM + 0x10000 + gSprites[r8].oam.tileNum * 32)); + CpuSet(&r8, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), 0x050000c0); + + RequestDma3Copy((void *)(VRAM + 0x10000 + (0x28 + gSprites[r6].oam.tileNum) * 32), (u8 *)(VRAM + 0x10000 + gSprites[r8].oam.tileNum * 32), 0x80, 1); + + // What is this? + zero = 0; + zero = 0; + + RequestDma3Copy((void *)(VRAM + 0x10000 + (0x28 + gSprites[r6].oam.tileNum) * 32), (u8 *)(VRAM + 0x10000 + gSprites[r6].oam.tileNum * 32), 0x80, 1); + + + gSprites[r6].data[0] = r8; + gSprites[r8].data[0] = r6; + + return r6; +} \ No newline at end of file From 284751e7610f5e9cf266bd0a8bb148464753afa1 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sat, 5 Jan 2019 23:02:28 -0800 Subject: [PATCH 04/42] Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. --- asm/contest.s | 4542 --------------------------------- data/contest.s | 2 +- data/text/contest_strings.inc | 10 +- include/contest.h | 6 +- include/graphics.h | 4 + src/contest.c | 2742 +++++++++++++++++++- src/graphics.c | 4 +- 7 files changed, 2730 insertions(+), 4580 deletions(-) diff --git a/asm/contest.s b/asm/contest.s index f5ca016df1..f30eb32613 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -5,4548 +5,6 @@ .text - thumb_func_start sub_80DCB78 -sub_80DCB78: @ 80DCB78 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gSprites - lsls r5, r0, 4 - adds r5, r0 - lsls r5, 2 - adds r5, r1 - ldrh r0, [r5, 0x2E] - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - adds r4, r1 - adds r0, r4, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite - adds r0, r5, 0 - bl DestroySpriteAndFreeResources - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DCB78 - - thumb_func_start sub_80DCBB4 -sub_80DCBB4: @ 80DCBB4 - push {lr} - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - ldr r1, =0x00000907 - movs r0, 0x52 - bl SetGpuReg - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DCBB4 - - thumb_func_start sub_80DCBD0 -sub_80DCBD0: @ 80DCBD0 - push {lr} - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - pop {r0} - bx r0 - thumb_func_end sub_80DCBD0 - - thumb_func_start sub_80DCBE8 -sub_80DCBE8: @ 80DCBE8 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - adds r4, r0, 0 - mov r9, r1 - lsls r4, 24 - lsrs r4, 24 - mov r0, r9 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - bl sub_80DCBB4 - ldr r0, =gContestResources - ldr r1, [r0] - ldr r2, =gSprites - mov r8, r2 - lsls r6, r4, 4 - adds r6, r4 - lsls r6, 2 - adds r0, r6, r2 - movs r3, 0x30 - ldrsh r2, [r0, r3] - ldr r1, [r1, 0x14] - lsls r2, 2 - adds r2, r1 - ldrb r1, [r2, 0x2] - movs r3, 0x2 - orrs r1, r3 - strb r1, [r2, 0x2] - ldrh r5, [r0, 0x2E] - lsls r5, 24 - lsrs r5, 24 - movs r1, 0x1 - bl StartSpriteAffineAnim - lsls r4, r5, 4 - adds r4, r5 - lsls r4, 2 - mov r1, r8 - adds r0, r4, r1 - movs r1, 0x1 - bl StartSpriteAffineAnim - movs r2, 0x1C - add r8, r2 - add r6, r8 - ldr r0, =sub_80DCC84 - str r0, [r6] - add r4, r8 - ldr r0, =SpriteCallbackDummy - str r0, [r4] - mov r3, r9 - cmp r3, 0 - bne _080DCC70 - movs r0, 0x65 - bl PlaySE - b _080DCC76 - .pool -_080DCC70: - movs r0, 0x2 - bl PlaySE -_080DCC76: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80DCBE8 - - thumb_func_start sub_80DCC84 -sub_80DCC84: @ 80DCC84 - push {lr} - mov r12, r0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080DCCCC - mov r0, r12 - ldrh r1, [r0, 0x2E] - lsls r1, 24 - lsrs r1, 24 - ldr r2, =gSprites - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r0, r2 - adds r0, r1, 0 - adds r0, 0x3F - ldrb r0, [r0] - lsls r0, 26 - cmp r0, 0 - bge _080DCCCC - mov r3, r12 - adds r3, 0x3E - ldrb r0, [r3] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r3] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - ldr r0, =sub_80DCCD8 - mov r1, r12 - str r0, [r1, 0x1C] -_080DCCCC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DCC84 - - thumb_func_start sub_80DCCD8 -sub_80DCCD8: @ 80DCCD8 - push {lr} - ldr r1, =gContestResources - ldr r1, [r1] - movs r3, 0x30 - ldrsh r2, [r0, r3] - ldr r1, [r1, 0x14] - lsls r2, 2 - adds r2, r1 - ldrb r3, [r2, 0x2] - movs r1, 0x3 - negs r1, r1 - ands r1, r3 - strb r1, [r2, 0x2] - ldrh r0, [r0, 0x2E] - lsls r0, 24 - lsrs r0, 24 - bl sub_80DCB78 - bl sub_80DCBD0 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DCCD8 - - thumb_func_start sub_80DCD08 -sub_80DCD08: @ 80DCD08 - push {lr} - ldr r0, =gHeap - movs r1, 0xD0 - lsls r1, 9 - adds r2, r0, r1 - ldrb r1, [r2] - adds r3, r0, 0 - cmp r1, 0x1 - bne _080DCD24 - movs r0, 0 - b _080DCD26 - .pool -_080DCD24: - movs r0, 0x1 -_080DCD26: - strb r0, [r2] - movs r1, 0xD0 - lsls r1, 9 - adds r0, r3, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080DCD3E - bl sub_80DAEA4 - bl sub_80DB2BC - b _080DCD42 -_080DCD3E: - bl sub_80DCD48 -_080DCD42: - pop {r0} - bx r0 - thumb_func_end sub_80DCD08 - - thumb_func_start sub_80DCD48 -sub_80DCD48: @ 80DCD48 - push {r4,r5,lr} - sub sp, 0xC - ldr r0, =gUnknown_020322D5 - ldrb r0, [r0] - cmp r0, 0 - beq _080DCE44 - ldr r0, =gHeap - movs r1, 0xD0 - lsls r1, 9 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080DCE44 - cmp r0, 0 - blt _080DCD7C - cmp r0, 0x3 - bgt _080DCD7C - cmp r0, 0x2 - blt _080DCD7C - bl sub_80DF750 - b _080DCE44 - .pool -_080DCD7C: - movs r5, 0 -_080DCD7E: - adds r0, r5, 0 - movs r1, 0 - bl FillWindowPixelBuffer - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bls _080DCD7E - movs r5, 0 -_080DCD92: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r1, [r0, 0x4] - lsls r0, r5, 3 - subs r0, r5 - lsls r0, 2 - adds r0, r1 - add r2, sp, 0x4 - ldrh r4, [r0, 0x4] - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _080DCDBC - negs r0, r0 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r2, 0 - ldr r1, =gText_OneDash - bl StringCopy - adds r2, r0, 0 -_080DCDBC: - lsls r1, r4, 16 - asrs r1, 16 - adds r0, r2, 0 - movs r2, 0 - movs r3, 0x4 - bl ConvertIntToDecimalStringN - ldr r0, =gUnknown_02039F26 - adds r0, r5, r0 - ldrb r0, [r0] - movs r1, 0x7 - str r1, [sp] - add r1, sp, 0x4 - movs r2, 0x37 - movs r3, 0x1 - bl Contest_PrintTextToBg0WindowAt - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bls _080DCD92 - movs r5, 0 -_080DCDEA: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r1, [r0, 0x4] - lsls r0, r5, 3 - subs r0, r5 - lsls r0, 2 - adds r0, r1 - add r2, sp, 0x4 - ldrh r4, [r0, 0x2] - movs r1, 0x2 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _080DCE14 - negs r0, r0 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r2, 0 - ldr r1, =gText_OneDash - bl StringCopy - adds r2, r0, 0 -_080DCE14: - lsls r1, r4, 16 - asrs r1, 16 - adds r0, r2, 0 - movs r2, 0 - movs r3, 0x4 - bl ConvertIntToDecimalStringN - ldr r0, =gUnknown_02039F26 - adds r0, r5, r0 - ldrb r0, [r0] - movs r1, 0x7 - str r1, [sp] - add r1, sp, 0x4 - movs r2, 0x5 - movs r3, 0x1 - bl Contest_PrintTextToBg0WindowAt - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bls _080DCDEA - bl sub_80DB2BC -_080DCE44: - add sp, 0xC - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DCD48 - - thumb_func_start sub_80DCE58 -sub_80DCE58: @ 80DCE58 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - add r4, sp, 0x4 - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x8 - bl memset - movs r5, 0 - add r4, sp, 0x4 - adds r6, r4, 0 - movs r7, 0 -_080DCE7E: - bl Random - adds r1, r0, 0 - mov r0, sp - adds r0, r7 - adds r0, 0x4 - strh r1, [r0] - movs r2, 0 - cmp r2, r5 - bge _080DCEB6 - lsls r0, r1, 16 - lsrs r0, 16 - mov r1, sp - ldrh r1, [r1, 0x4] - cmp r0, r1 - beq _080DCEB0 -_080DCE9E: - adds r2, 0x1 - cmp r2, r5 - bge _080DCEB6 - lsls r0, r2, 1 - adds r0, r4, r0 - ldrh r1, [r6] - ldrh r0, [r0] - cmp r1, r0 - bne _080DCE9E -_080DCEB0: - subs r6, 0x2 - subs r7, 0x2 - subs r5, 0x1 -_080DCEB6: - adds r6, 0x2 - adds r7, 0x2 - adds r5, 0x1 - cmp r5, 0x3 - ble _080DCE7E - mov r2, r8 - cmp r2, 0 - bne _080DCF80 - movs r5, 0 - ldr r3, =gUnknown_02039F26 - mov r8, r3 -_080DCECC: - mov r6, r8 - strb r5, [r6] - movs r4, 0 - cmp r4, r5 - bge _080DCF48 - ldr r7, =gContestMonConditions - mov r9, r7 - lsls r0, r5, 1 - adds r1, r0, 0 - add r1, r9 - mov r12, r1 - mov r2, sp - adds r2, 0x4 - str r2, [sp, 0xC] - add r0, sp - adds r0, 0x4 - str r0, [sp, 0x10] - ldr r3, =gUnknown_02039F26 - adds r6, r3, 0 - mov r10, r6 -_080DCEF4: - ldrb r0, [r3] - lsls r2, r0, 1 - mov r7, r9 - adds r0, r2, r7 - movs r6, 0 - ldrsh r1, [r0, r6] - mov r7, r12 - movs r6, 0 - ldrsh r0, [r7, r6] - cmp r1, r0 - blt _080DCF1C - cmp r1, r0 - bne _080DCF40 - ldr r7, [sp, 0xC] - adds r0, r7, r2 - ldrh r0, [r0] - ldr r1, [sp, 0x10] - ldrh r1, [r1] - cmp r0, r1 - bcs _080DCF40 -_080DCF1C: - adds r2, r5, 0 - cmp r5, r4 - ble _080DCF34 - subs r0, r5, 0x1 - mov r6, r10 - adds r1, r0, r6 -_080DCF28: - ldrb r0, [r1] - strb r0, [r1, 0x1] - subs r1, 0x1 - subs r2, 0x1 - cmp r2, r4 - bgt _080DCF28 -_080DCF34: - strb r5, [r3] - b _080DCF48 - .pool -_080DCF40: - adds r3, 0x1 - adds r4, 0x1 - cmp r4, r5 - blt _080DCEF4 -_080DCF48: - cmp r4, r5 - bne _080DCF50 - mov r7, r8 - strb r5, [r7] -_080DCF50: - movs r0, 0x1 - add r8, r0 - adds r5, 0x1 - cmp r5, 0x3 - ble _080DCECC - ldr r4, =gUnknown_02039F26 - mov r0, sp - adds r1, r4, 0 - movs r2, 0x4 - bl memcpy - movs r5, 0 -_080DCF68: - mov r1, sp - adds r0, r1, r5 - ldrb r0, [r0] - adds r0, r4 - strb r5, [r0] - adds r5, 0x1 - cmp r5, 0x3 - ble _080DCF68 - b _080DD034 - .pool -_080DCF80: - mov r0, sp - movs r1, 0xFF - movs r2, 0x4 - bl memset - movs r5, 0 - ldr r3, =gUnknown_02039F26 - movs r6, 0 -_080DCF90: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0, 0x4] - adds r0, r6, r0 - ldrb r0, [r0, 0xB] - lsls r0, 30 - lsrs r2, r0, 30 - mov r7, sp - adds r1, r7, r2 - b _080DCFB6 - .pool -_080DCFAC: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - mov r0, sp - adds r1, r0, r2 -_080DCFB6: - ldrb r0, [r1] - cmp r0, 0xFF - bne _080DCFAC - strb r5, [r1] - strb r2, [r3] - adds r3, 0x1 - adds r6, 0x1C - adds r5, 0x1 - cmp r5, 0x3 - ble _080DCF90 - movs r5, 0 -_080DCFCC: - movs r4, 0x3 - adds r1, r5, 0x1 - mov r10, r1 - cmp r4, r5 - ble _080DD02E - mov r9, r4 - ldr r2, =gUnknown_02039F26 - mov r8, r2 - add r3, sp, 0x4 - mov r12, r3 -_080DCFE0: - ldr r6, =gContestResources - ldr r0, [r6] - ldr r1, [r0, 0x4] - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - adds r0, r1 - adds r1, r0, 0 - subs r1, 0x1C - ldrb r2, [r1, 0xB] - ldrb r3, [r0, 0xB] - mov r1, r9 - ands r1, r2 - mov r0, r9 - ands r0, r3 - subs r3, r4, 0x1 - cmp r1, r0 - bne _080DD028 - mov r0, r8 - adds r7, r3, r0 - adds r2, r4, r0 - ldrb r6, [r7] - ldrb r1, [r2] - cmp r6, r1 - bcs _080DD028 - lsls r0, r3, 1 - add r0, r12 - lsls r1, r4, 1 - add r1, r12 - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcs _080DD028 - ldrb r0, [r2] - strb r6, [r2] - strb r0, [r7] -_080DD028: - adds r4, r3, 0 - cmp r4, r5 - bgt _080DCFE0 -_080DD02E: - mov r5, r10 - cmp r5, 0x2 - ble _080DCFCC -_080DD034: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DCE58 - - thumb_func_start sub_80DD04C -sub_80DD04C: @ 80DD04C - push {r4,r5,lr} - movs r4, 0 - movs r5, 0xA0 -_080DD052: - ldr r0, =gHeap+0x1A004 - adds r0, r5, r0 - ldr r1, =gUnknown_02039F26 - adds r1, r4, r1 - ldrb r1, [r1] - adds r1, 0x5 - lsls r1, 4 - movs r2, 0x20 - bl LoadPalette - adds r5, 0x20 - adds r4, 0x1 - cmp r4, 0x3 - ble _080DD052 - bl sub_80DAEA4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DD04C - - thumb_func_start sub_80DD080 -sub_80DD080: @ 80DD080 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r4, =gContestResources - ldr r3, [r4] - ldr r1, [r3, 0x4] - lsls r7, r6, 3 - subs r0, r7, r6 - lsls r5, r0, 2 - adds r1, r5, r1 - movs r2, 0 - strh r2, [r1, 0x2] - ldr r0, [r3, 0x4] - adds r0, r5, r0 - strh r2, [r0] - adds r0, r6, 0 - bl sub_80DBA68 - lsls r0, 24 - mov r8, r4 - cmp r0, 0 - bne _080DD0B4 - b _080DD3C4 -_080DD0B4: - ldr r0, [r4] - ldr r1, [r0, 0x4] - adds r1, r5, r1 - ldrh r0, [r1, 0x6] - ldr r2, =gContestMoves - lsls r0, 3 - adds r0, r2 - ldrb r2, [r0] - mov r9, r2 - ldrb r0, [r0, 0x1] - lsls r0, 29 - lsrs r0, 29 - strb r0, [r1, 0xA] - ldr r0, [r4] - ldr r0, [r0, 0x4] - adds r2, r5, r0 - ldrh r0, [r2, 0x6] - ldrh r1, [r2, 0x8] - cmp r0, r1 - bne _080DD110 - cmp r0, 0 - beq _080DD110 - ldrb r0, [r2, 0x15] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x15] - ldr r0, [r4] - ldr r2, [r0, 0x4] - adds r2, r5, r2 - ldrb r3, [r2, 0xB] - lsls r1, r3, 25 - lsrs r1, 29 - adds r1, 0x1 - movs r0, 0x7 - ands r1, r0 - lsls r1, 4 - movs r0, 0x71 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2, 0xB] - b _080DD12C - .pool -_080DD110: - ldr r4, =gContestResources - ldr r0, [r4] - ldr r0, [r0, 0x4] - lsls r3, r6, 3 - subs r1, r3, r6 - lsls r1, 2 - adds r1, r0 - ldrb r2, [r1, 0xB] - movs r0, 0x71 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0xB] - mov r8, r4 - adds r7, r3, 0 -_080DD12C: - mov r2, r8 - ldr r4, [r2] - ldr r2, [r4, 0x4] - subs r0, r7, r6 - lsls r0, 2 - adds r2, r0, r2 - ldr r3, =gContestEffects - mov r1, r9 - lsls r5, r1, 2 - adds r3, r5, r3 - ldrb r1, [r3, 0x1] - strh r1, [r2] - ldr r1, [r4, 0x4] - adds r0, r1 - ldrh r1, [r0] - strh r1, [r0, 0x2] - ldr r1, [r4, 0x8] - ldrb r0, [r3, 0x2] - strh r0, [r1, 0x4] - ldr r1, [r4, 0x8] - ldrh r0, [r1, 0x4] - strh r0, [r1, 0x6] - ldr r0, [r4, 0x8] - strb r6, [r0, 0x11] - movs r2, 0 - mov r9, r5 - mov r4, r8 - movs r3, 0 - movs r1, 0 -_080DD166: - ldr r0, [r4] - ldr r0, [r0, 0x4] - adds r0, r1, r0 - strb r3, [r0, 0xE] - ldr r0, [r4] - ldr r0, [r0, 0x8] - adds r0, 0xD - adds r0, r2 - strb r3, [r0] - adds r1, 0x1C - adds r2, 0x1 - cmp r2, 0x3 - ble _080DD166 - ldr r5, =gContestResources - ldr r0, [r5] - ldr r1, [r0, 0x4] - subs r0, r7, r6 - lsls r4, r0, 2 - adds r2, r4, r1 - ldrb r1, [r2, 0x15] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080DD1B4 - ldrh r0, [r2, 0x8] - ldrh r1, [r2, 0x6] - bl AreMovesContestCombo - lsls r0, 24 - cmp r0, 0 - bne _080DD1B4 - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x15] - movs r0, 0x11 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x15] -_080DD1B4: - ldr r0, =gContestEffectFuncs - add r0, r9 - ldr r0, [r0] - bl _call_via_r0 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r1, [r0, 0x4] - subs r0, r7, r6 - lsls r0, 2 - adds r2, r0, r1 - ldrb r1, [r2, 0x10] - movs r0, 0x30 - ands r0, r1 - cmp r0, 0x10 - bne _080DD1EC - ldrh r1, [r2, 0x2] - subs r1, 0xA - movs r0, 0xD - ldrsb r0, [r2, r0] - b _080DD206 - .pool -_080DD1EC: - ldrb r1, [r2, 0x11] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080DD200 - movs r1, 0xD - ldrsb r1, [r2, r1] - lsls r0, r1, 1 - adds r0, r1 - b _080DD204 -_080DD200: - movs r0, 0xD - ldrsb r0, [r2, r0] -_080DD204: - ldrh r1, [r2, 0x2] -_080DD206: - adds r0, r1 - strh r0, [r2, 0x2] - ldr r5, =gContestResources - ldr r0, [r5] - ldr r1, [r0, 0x4] - subs r0, r7, r6 - lsls r4, r0, 2 - adds r1, r4, r1 - movs r0, 0 - strb r0, [r1, 0x16] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x15] - movs r0, 0x41 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x15] - adds r0, r6, 0 - bl sub_80DE1E8 - lsls r0, 24 - cmp r0, 0 - beq _080DD2E2 - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrh r0, [r1, 0x8] - ldrh r1, [r1, 0x6] - bl AreMovesContestCombo - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0 - beq _080DD29C - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r2, r4, r0 - ldrb r1, [r2, 0x15] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080DD29C - strb r3, [r2, 0x16] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r0, [r1, 0x15] - movs r2, 0x40 - orrs r0, r2 - strb r0, [r1, 0x15] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r2, [r1, 0x15] - movs r0, 0x11 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x15] - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - movs r1, 0 - ldrsh r2, [r0, r1] - ldrb r1, [r0, 0x16] - muls r1, r2 - strb r1, [r0, 0x17] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r0, [r1, 0x15] - movs r2, 0x8 - b _080DD2C8 - .pool -_080DD29C: - ldr r2, =gContestMoves - ldr r5, =gContestResources - ldr r0, [r5] - ldr r1, [r0, 0x4] - subs r0, r7, r6 - lsls r4, r0, 2 - adds r3, r4, r1 - ldrh r0, [r3, 0x6] - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x2] - cmp r0, 0 - beq _080DD2D8 - ldrb r0, [r3, 0x15] - movs r1, 0x10 - orrs r0, r1 - strb r0, [r3, 0x15] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r0, [r1, 0x15] - movs r2, 0x40 -_080DD2C8: - orrs r0, r2 - strb r0, [r1, 0x15] - b _080DD2E2 - .pool -_080DD2D8: - ldrb r1, [r3, 0x15] - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - strb r0, [r3, 0x15] -_080DD2E2: - ldr r5, =gContestResources - ldr r0, [r5] - ldr r1, [r0, 0x4] - subs r0, r7, r6 - lsls r4, r0, 2 - adds r2, r4, r1 - ldrb r1, [r2, 0x15] - movs r0, 0x1 - mov r8, r0 - ands r0, r1 - cmp r0, 0 - beq _080DD30A - ldrb r0, [r2, 0xB] - lsls r0, 25 - lsrs r0, 29 - adds r0, 0x1 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 1 - strb r1, [r2, 0x18] -_080DD30A: - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r2, r4, r0 - ldrb r1, [r2, 0xC] - mov r0, r8 - ands r0, r1 - cmp r0, 0 - beq _080DD334 - ldrb r1, [r2, 0x15] - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x15] - ldr r2, [r5] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - movs r1, 0 - strh r1, [r0, 0x2] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - strh r1, [r0] -_080DD334: - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - ldrh r0, [r0, 0x6] - bl Contest_GetMoveExcitement - ldr r1, [r5] - ldr r1, [r1, 0x10] - strb r0, [r1] - ldr r2, [r5] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - ldrb r1, [r0, 0x11] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080DD35C - ldr r0, [r2, 0x10] - mov r1, r8 - strb r1, [r0] -_080DD35C: - ldr r1, [r5] - ldr r3, [r1, 0x10] - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r0, 0 - ble _080DD388 - ldr r0, [r1] - ldrb r0, [r0, 0x13] - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r3, r1] - adds r0, r1 - cmp r0, 0x4 - ble _080DD384 - movs r0, 0x3C - b _080DD38A - .pool -_080DD384: - movs r0, 0xA - b _080DD38A -_080DD388: - movs r0, 0 -_080DD38A: - strb r0, [r3, 0x2] - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - movs r2, 0 - b _080DD3AE -_080DD3A2: - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 -_080DD3A8: - adds r2, 0x1 - cmp r2, 0x3 - bgt _080DD3B6 -_080DD3AE: - cmp r2, r6 - beq _080DD3A8 - cmp r0, 0 - bne _080DD3A2 -_080DD3B6: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r1, [r0, 0x4] - subs r0, r7, r6 - lsls r0, 2 - adds r0, r1 - strb r2, [r0, 0x1B] -_080DD3C4: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DD080 - - thumb_func_start SetContestantEffectStringID -SetContestantEffectStringID: @ 80DD3D4 - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gContestResources - ldr r2, [r2] - ldr r3, [r2, 0x4] - lsls r2, r0, 3 - subs r2, r0 - lsls r2, 2 - adds r2, r3 - strb r1, [r2, 0x13] - bx lr - .pool - thumb_func_end SetContestantEffectStringID - - thumb_func_start SetContestantEffectStringID2 -SetContestantEffectStringID2: @ 80DD3F0 - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gContestResources - ldr r2, [r2] - ldr r3, [r2, 0x4] - lsls r2, r0, 3 - subs r2, r0 - lsls r2, 2 - adds r2, r3 - strb r1, [r2, 0x14] - bx lr - .pool - thumb_func_end SetContestantEffectStringID2 - - thumb_func_start SetStartledString -SetStartledString: @ 80DD40C - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r3, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r2, r1, 0 - cmp r1, 0x3B - bls _080DD426 - movs r1, 0x35 - bl SetContestantEffectStringID - b _080DD456 -_080DD426: - cmp r1, 0x27 - bls _080DD432 - movs r1, 0x34 - bl SetContestantEffectStringID - b _080DD456 -_080DD432: - cmp r1, 0x1D - bls _080DD43E - movs r1, 0x33 - bl SetContestantEffectStringID - b _080DD456 -_080DD43E: - cmp r1, 0x13 - bls _080DD44A - movs r1, 0x32 - bl SetContestantEffectStringID - b _080DD456 -_080DD44A: - cmp r2, 0x9 - bls _080DD456 - adds r0, r3, 0 - movs r1, 0x31 - bl SetContestantEffectStringID -_080DD456: - pop {r0} - bx r0 - thumb_func_end SetStartledString - - thumb_func_start sub_80DD45C -sub_80DD45C: @ 80DD45C - push {r4-r6,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r1, 24 - lsrs r6, r1, 24 - ldr r0, =gStringVar1 - lsls r1, r4, 6 - ldr r2, =gContestMons + 2 - adds r1, r2 - bl StringCopy - ldr r0, =gStringVar2 - ldr r5, =gContestResources - ldr r1, [r5] - ldr r2, [r1, 0x4] - lsls r1, r4, 3 - subs r1, r4 - lsls r1, 2 - adds r1, r2 - ldrh r2, [r1, 0x6] - movs r1, 0xD - muls r1, r2 - ldr r2, =gMoveNames - adds r1, r2 - bl StringCopy - ldr r3, =gContestMoves - ldr r1, [r5] - ldr r0, [r1, 0x8] - ldrb r2, [r0, 0x11] - ldr r1, [r1, 0x4] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0, 0x6] - lsls r0, 3 - adds r0, r3 - ldrb r0, [r0, 0x1] - lsls r1, r0, 29 - cmp r1, 0 - bne _080DD4DC - ldr r0, =gStringVar3 - ldr r1, =gText_0827E837 - bl StringCopy - b _080DD52C - .pool -_080DD4DC: - lsrs r0, r1, 29 - cmp r0, 0x1 - bne _080DD4F4 - ldr r0, =gStringVar3 - ldr r1, =gText_0827E83F - bl StringCopy - b _080DD52C - .pool -_080DD4F4: - lsrs r0, r1, 29 - cmp r0, 0x2 - bne _080DD50C - ldr r0, =gStringVar3 - ldr r1, =gText_0827E847 - bl StringCopy - b _080DD52C - .pool -_080DD50C: - lsrs r0, r1, 29 - cmp r0, 0x3 - bne _080DD524 - ldr r0, =gStringVar3 - ldr r1, =gText_0827E850 - bl StringCopy - b _080DD52C - .pool -_080DD524: - ldr r0, =gStringVar3 - ldr r1, =gText_0827E85A - bl StringCopy -_080DD52C: - ldr r4, =gStringVar4 - ldr r1, =gUnknown_08587E10 - lsls r0, r6, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl StringExpandPlaceholders - bl sub_80DB89C - adds r0, r4, 0 - movs r1, 0x1 - bl Contest_StartTextPrinter - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DD45C - - thumb_func_start MakeContestantNervous -MakeContestantNervous: @ 80DD560 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, =gContestResources - ldr r1, [r4] - ldr r3, [r1, 0x4] - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r3, r1, r3 - ldrb r0, [r3, 0xC] - movs r2, 0x1 - orrs r0, r2 - strb r0, [r3, 0xC] - ldr r0, [r4] - ldr r0, [r0, 0x4] - adds r1, r0 - movs r0, 0 - strh r0, [r1, 0x6] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end MakeContestantNervous - - thumb_func_start sub_80DD590 -sub_80DD590: @ 80DD590 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - movs r0, 0 - mov r12, r0 - movs r4, 0 - ldr r1, =gUnknown_02039F26 - mov r9, r1 - add r2, sp, 0x4 - mov r6, r9 - movs r5, 0 - adds r3, r2, 0 -_080DD5AC: - mov r0, sp - adds r1, r0, r4 - adds r0, r4, r6 - ldrb r0, [r0] - strb r0, [r1] - adds r0, r3, r4 - strb r5, [r0] - adds r4, 0x1 - cmp r4, 0x3 - ble _080DD5AC - movs r4, 0 - ldr r7, =gContestResources - ldr r1, [r7] - mov r8, r1 - adds r5, r2, 0 -_080DD5CA: - movs r2, 0 - mov r0, r8 - ldr r1, [r0, 0x4] -_080DD5D0: - ldrb r0, [r1, 0x19] - cmp r0, r4 - beq _080DD604 - adds r1, 0x1C - adds r2, 0x1 - cmp r2, 0x3 - ble _080DD5D0 -_080DD5DE: - cmp r2, 0x4 - bne _080DD684 - movs r2, 0 - ldrb r0, [r5] - cmp r0, 0 - bne _080DD612 - ldr r0, [r7] - ldr r0, [r0, 0x4] - ldrb r0, [r0, 0x19] - cmp r0, 0xFF - bne _080DD612 - mov r12, r2 - movs r2, 0x1 - b _080DD63A - .pool -_080DD604: - mov r1, sp - adds r0, r1, r2 - strb r4, [r0] - adds r1, r5, r2 - movs r0, 0x1 - strb r0, [r1] - b _080DD5DE -_080DD612: - adds r2, 0x1 - cmp r2, 0x3 - bgt _080DD676 - adds r0, r5, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080DD612 - ldr r0, [r7] - ldr r1, [r0, 0x4] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x19] - cmp r0, 0xFF - bne _080DD612 - lsls r0, r2, 24 - lsrs r0, 24 - mov r12, r0 - adds r2, 0x1 -_080DD63A: - cmp r2, 0x3 - bgt _080DD676 - ldr r6, =gUnknown_02039F26 - lsls r0, r2, 3 - subs r0, r2 - lsls r3, r0, 2 -_080DD646: - adds r0, r5, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080DD66E - ldr r0, [r7] - ldr r0, [r0, 0x4] - adds r0, r3, r0 - ldrb r0, [r0, 0x19] - cmp r0, 0xFF - bne _080DD66E - mov r1, r12 - adds r0, r1, r6 - adds r1, r2, r6 - ldrb r0, [r0] - ldrb r1, [r1] - cmp r0, r1 - bls _080DD66E - lsls r0, r2, 24 - lsrs r0, 24 - mov r12, r0 -_080DD66E: - adds r3, 0x1C - adds r2, 0x1 - cmp r2, 0x3 - ble _080DD646 -_080DD676: - mov r0, sp - add r0, r12 - strb r4, [r0] - mov r0, r12 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080DD684: - adds r4, 0x1 - cmp r4, 0x3 - ble _080DD5CA - movs r4, 0 - ldr r6, =gContestResources - movs r5, 0 -_080DD690: - ldr r0, [r6] - ldr r1, [r0, 0x8] - adds r1, r4 - mov r0, sp - adds r3, r0, r4 - ldrb r0, [r3] - strb r0, [r1] - ldr r0, [r6] - ldr r0, [r0, 0x4] - adds r0, r5, r0 - movs r1, 0xFF - strb r1, [r0, 0x19] - ldr r0, [r6] - ldr r1, [r0, 0x4] - adds r1, r5, r1 - ldrb r2, [r1, 0x10] - movs r0, 0x3F - ands r0, r2 - strb r0, [r1, 0x10] - mov r0, r9 - adds r1, r4, r0 - ldrb r0, [r3] - strb r0, [r1] - adds r5, 0x1C - adds r4, 0x1 - cmp r4, 0x3 - ble _080DD690 - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DD590 - - thumb_func_start sub_80DD6DC -sub_80DD6DC: @ 80DD6DC - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x30] - adds r1, r0, 0x1 - strh r1, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x54 - ble _080DD712 - movs r0, 0 - strh r0, [r2, 0x30] - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] - ldr r0, =SpriteCallbackDummy - str r0, [r2, 0x1C] - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r1, [r2, 0x6] - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x6] -_080DD712: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DD6DC - - thumb_func_start sub_80DD720 -sub_80DD720: @ 80DD720 - push {r4,r5,lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - ldrb r5, [r0, 0x12] - cmp r1, 0x8 - bls _080DD734 - b _080DD8D4 -_080DD734: - lsls r0, r1, 2 - ldr r1, =_080DD748 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080DD748: - .4byte _080DD76C - .4byte _080DD76C - .4byte _080DD79C - .4byte _080DD7D0 - .4byte _080DD804 - .4byte _080DD838 - .4byte _080DD86C - .4byte _080DD8D4 - .4byte _080DD8A0 -_080DD76C: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1, 0x2E] - ldr r2, =0x000003ff - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0x20 - bl PlaySE - b _080DD8F8 - .pool -_080DD79C: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r1, 0x2E] - adds r2, 0x4 - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0x1F - bl PlaySE - b _080DD8F8 - .pool -_080DD7D0: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r1, 0x2E] - adds r2, 0x8 - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0x1F - bl PlaySE - b _080DD8F8 - .pool -_080DD804: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r1, 0x2E] - adds r2, 0xC - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0x2D - bl PlaySE - b _080DD8F8 - .pool -_080DD838: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r1, 0x2E] - adds r2, 0xC - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0x2D - bl PlaySE - b _080DD8F8 - .pool -_080DD86C: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r1, 0x2E] - adds r2, 0x10 - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0x2D - bl PlaySE - b _080DD8F8 - .pool -_080DD8A0: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r1, 0x2E] - adds r2, 0x18 - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0xC3 - bl PlaySE - b _080DD8F8 - .pool -_080DD8D4: - ldr r0, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r1, 0x2E] - adds r2, 0x14 - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r2, r0 - ldrh r3, [r1, 0x4] - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r2 - strh r0, [r1, 0x4] - movs r0, 0x2D - bl PlaySE -_080DD8F8: - adds r2, r4, 0 - ldr r4, =gSprites - adds r2, r5 - lsls r2, 2 - adds r1, r2, r4 - movs r0, 0 - strh r0, [r1, 0x30] - adds r1, 0x3E - ldrb r3, [r1] - subs r0, 0x5 - ands r0, r3 - strb r0, [r1] - adds r4, 0x1C - adds r2, r4 - ldr r0, =sub_80DD6DC - str r0, [r2] - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r0, [r2, 0x6] - movs r1, 0x10 - orrs r0, r1 - strb r0, [r2, 0x6] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DD720 - - thumb_func_start sub_80DD940 -sub_80DD940: @ 80DD940 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r5, 0 - ldr r6, =gContestResources - ldr r0, =gSprites - mov r9, r0 - ldr r0, =0x06010000 - mov r8, r0 - ldr r7, =0x04000008 -_080DD956: - ldr r0, [r6] - ldr r1, [r0] - movs r0, 0x13 - ldrsb r0, [r1, r0] - ldr r4, =gContestApplauseMeterGfx - cmp r5, r0 - bge _080DD966 - adds r4, 0x40 -_080DD966: - adds r0, r1, 0 - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r9 - ldrh r1, [r0, 0x4] - lsls r1, 22 - lsrs r1, 22 - adds r0, r5, 0 - adds r0, 0x11 - adds r1, r0 - lsls r1, 5 - add r1, r8 - adds r0, r4, 0 - adds r2, r7, 0 - bl CpuSet - adds r0, r4, 0 - adds r0, 0x20 - ldr r1, [r6] - ldr r1, [r1] - adds r1, 0x58 - ldrb r2, [r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - add r1, r9 - ldrh r1, [r1, 0x4] - lsls r1, 22 - lsrs r1, 22 - adds r2, r5, 0 - adds r2, 0x19 - adds r1, r2 - lsls r1, 5 - add r1, r8 - adds r2, r7, 0 - bl CpuSet - ldr r0, [r6] - ldr r0, [r0] - ldrb r0, [r0, 0x13] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - ble _080DD9C8 - bl sub_80DDA20 -_080DD9C8: - adds r5, 0x1 - cmp r5, 0x4 - ble _080DD956 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DD940 - - thumb_func_start Contest_GetMoveExcitement -Contest_GetMoveExcitement: @ 80DD9F0 - lsls r0, 16 - ldr r3, =gUnknown_085899EC - ldr r1, =gContestMoves - lsrs r0, 13 - adds r0, r1 - ldrb r1, [r0, 0x1] - lsls r1, 29 - lsrs r1, 29 - ldr r0, =gSpecialVar_ContestCategory - ldrh r2, [r0] - lsls r0, r2, 2 - adds r0, r2 - adds r1, r0 - adds r1, r3 - movs r0, 0 - ldrsb r0, [r1, r0] - bx lr - .pool - thumb_func_end Contest_GetMoveExcitement - - thumb_func_start sub_80DDA20 -sub_80DDA20: @ 80DDA20 - push {r4,r5,lr} - ldr r0, =c3_08130B10 - movs r1, 0xA - bl CreateTask - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =gTasks - lsls r4, r5, 2 - adds r4, r5 - lsls r4, 3 - adds r4, r0 - movs r0, 0x1 - strh r0, [r4, 0xA] - ldr r0, =0x0000abe2 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0xC] - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DDA20 - - thumb_func_start c3_08130B10 -c3_08130B10: @ 80DDA60 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r2, r0, r1 - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _080DDAFE - movs r0, 0 - strh r0, [r2, 0x8] - movs r3, 0xE - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _080DDA94 - ldrh r0, [r2, 0x10] - adds r0, 0x1 - b _080DDA98 - .pool -_080DDA94: - ldrh r0, [r2, 0x10] - subs r0, 0x1 -_080DDA98: - strh r0, [r2, 0x10] - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0xC - ldrsh r0, [r4, r1] - lsls r0, 4 - movs r3, 0x84 - lsls r3, 1 - adds r6, r3, 0 - adds r0, r6 - lsls r0, 16 - lsrs r0, 16 - ldrb r2, [r4, 0x10] - ldr r3, =0x00007fff - movs r1, 0x1 - bl BlendPalette - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080DDACA - cmp r0, 0x10 - bne _080DDAFE -_080DDACA: - ldrh r0, [r4, 0xE] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0xE] - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - ldrb r0, [r0, 0x13] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - bgt _080DDAFE - movs r3, 0xC - ldrsh r0, [r4, r3] - lsls r0, 4 - adds r0, r6 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - movs r2, 0 - movs r3, 0x1F - bl BlendPalette - adds r0, r5, 0 - bl DestroyTask -_080DDAFE: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end c3_08130B10 - - thumb_func_start sub_80DDB0C -sub_80DDB0C: @ 80DDB0C - push {r4,lr} - ldr r0, =sub_80DDB6C - movs r1, 0xA - bl CreateTask - ldr r3, =gSprites - ldr r4, =gContestResources - ldr r2, [r4] - ldr r0, [r2] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldr r1, =0x0000ffba - strh r1, [r0, 0x24] - ldr r0, [r2] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - ldr r0, [r4] - ldr r2, [r0] - ldrb r0, [r2, 0x6] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r2, 0x6] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDB0C - - thumb_func_start sub_80DDB6C -sub_80DDB6C: @ 80DDB6C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r3, r0, 0 - ldr r4, =gContestResources - ldr r0, [r4] - ldr r0, [r0] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r2, r0, r1 - ldr r0, =gTasks - lsls r1, r3, 2 - adds r1, r3 - lsls r1, 3 - adds r1, r0 - movs r5, 0xD0 - lsls r5, 3 - adds r0, r5, 0 - ldrh r5, [r1, 0x1C] - adds r0, r5 - strh r0, [r1, 0x1C] - lsls r0, 16 - asrs r0, 24 - ldrh r5, [r2, 0x24] - adds r0, r5 - strh r0, [r2, 0x24] - ldrb r0, [r1, 0x1C] - strh r0, [r1, 0x1C] - movs r1, 0x24 - ldrsh r0, [r2, r1] - cmp r0, 0 - ble _080DDBB8 - movs r0, 0 - strh r0, [r2, 0x24] -_080DDBB8: - movs r5, 0x24 - ldrsh r0, [r2, r5] - cmp r0, 0 - bne _080DDBD4 - ldr r0, [r4] - ldr r2, [r0] - ldrb r1, [r2, 0x6] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x6] - adds r0, r3, 0 - bl DestroyTask -_080DDBD4: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDB6C - - thumb_func_start sub_80DDBE8 -sub_80DDBE8: @ 80DDBE8 - push {r4,r5,lr} - ldr r5, =gSprites - ldr r4, =gContestResources - ldr r0, [r4] - ldr r2, [r0] - adds r0, r2, 0 - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r0, [r0] - lsls r0, 29 - cmp r0, 0 - bge _080DDC1C - ldrb r1, [r2, 0x6] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - b _080DDC40 - .pool -_080DDC1C: - ldr r0, =task08_080CD1CC - movs r1, 0xA - bl CreateTask - ldr r2, [r4] - ldr r0, [r2] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - movs r1, 0 - strh r1, [r0, 0x24] - ldr r2, [r2] - ldrb r0, [r2, 0x6] - movs r1, 0x40 - orrs r0, r1 -_080DDC40: - strb r0, [r2, 0x6] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDBE8 - - thumb_func_start task08_080CD1CC -task08_080CD1CC: @ 80DDC4C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r5, =gContestResources - ldr r0, [r5] - ldr r0, [r0] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r3, r0, r1 - ldr r0, =gTasks - lsls r2, r4, 2 - adds r2, r4 - lsls r2, 3 - adds r2, r0 - movs r1, 0xD0 - lsls r1, 3 - adds r0, r1, 0 - ldrh r1, [r2, 0x1C] - adds r0, r1 - strh r0, [r2, 0x1C] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r3, 0x24] - subs r1, r0 - strh r1, [r3, 0x24] - ldrb r0, [r2, 0x1C] - strh r0, [r2, 0x1C] - movs r2, 0x24 - ldrsh r0, [r3, r2] - movs r1, 0x46 - negs r1, r1 - cmp r0, r1 - bge _080DDC9C - ldr r0, =0x0000ffba - strh r0, [r3, 0x24] -_080DDC9C: - movs r2, 0x24 - ldrsh r0, [r3, r2] - cmp r0, r1 - bne _080DDCC4 - adds r2, r3, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, [r5] - ldr r2, [r0] - ldrb r1, [r2, 0x6] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x6] - adds r0, r4, 0 - bl DestroyTask -_080DDCC4: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end task08_080CD1CC - - thumb_func_start sub_80DDCDC -sub_80DDCDC: @ 80DDCDC - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =sub_80DDD20 - movs r1, 0x5 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - lsls r4, 24 - asrs r4, 24 - strh r4, [r1, 0x8] - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r0, [r2, 0x6] - movs r1, 0x20 - orrs r0, r1 - strb r0, [r2, 0x6] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDCDC - - thumb_func_start sub_80DDD20 -sub_80DDD20: @ 80DDD20 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x1C - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080DDD54 - cmp r0, 0x1 - bgt _080DDD48 - cmp r0, 0 - beq _080DDD4E - b _080DDD9C - .pool -_080DDD48: - cmp r0, 0x2 - beq _080DDD70 - b _080DDD9C -_080DDD4E: - bl sub_80DDB0C - b _080DDD64 -_080DDD54: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - ldrb r1, [r0, 0x6] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _080DDD9C -_080DDD64: - ldrh r0, [r4, 0x1C] - adds r0, 0x1 - strh r0, [r4, 0x1C] - b _080DDD9C - .pool -_080DDD70: - ldrh r0, [r4, 0x1E] - adds r1, r0, 0x1 - strh r1, [r4, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - ble _080DDD9C - movs r0, 0 - strh r0, [r4, 0x1E] - bl sub_80DD940 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r1, [r2, 0x6] - movs r0, 0x21 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x6] - adds r0, r5, 0 - bl DestroyTask -_080DDD9C: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDD20 - - thumb_func_start sub_80DDDA8 -sub_80DDDA8: @ 80DDDA8 - ldr r3, =gSprites - ldr r0, =gContestResources - ldr r2, [r0] - ldr r0, [r2] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - movs r1, 0 - strh r1, [r0, 0x24] - ldr r0, [r2] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_80DDDA8 - - thumb_func_start sub_80DDDE4 -sub_80DDDE4: @ 80DDDE4 - ldr r2, =gSprites - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_80DDDE4 - - thumb_func_start sub_80DDE0C -sub_80DDE0C: @ 80DDE0C - push {lr} - ldr r0, =sub_80DDE30 - movs r1, 0xF - bl CreateTask - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r0, [r2, 0x6] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x6] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDE0C - - thumb_func_start sub_80DDE30 -sub_80DDE30: @ 80DDE30 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - ble _080DDEBA - movs r0, 0 - strh r0, [r4, 0x1C] - movs r1, 0x1E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080DDE78 - ldr r0, =gHeap+0x19000 - ldr r1, =0x06002000 - movs r2, 0x80 - lsls r2, 5 - movs r3, 0x1 - bl RequestDma3Copy - b _080DDE8C - .pool -_080DDE78: - ldr r0, =gHeap+0x18000 - ldr r1, =0x06002000 - movs r2, 0x80 - lsls r2, 5 - movs r3, 0x1 - bl RequestDma3Copy - ldrh r0, [r4, 0x20] - adds r0, 0x1 - strh r0, [r4, 0x20] -_080DDE8C: - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x1E] - movs r2, 0x1 - eors r1, r2 - strh r1, [r0, 0x1E] - movs r1, 0x20 - ldrsh r0, [r0, r1] - cmp r0, 0x9 - bne _080DDEBA - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r1, [r2, 0x6] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2, 0x6] - adds r0, r5, 0 - bl DestroyTask -_080DDEBA: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDE30 - - thumb_func_start sub_80DDED0 -sub_80DDED0: @ 80DDED0 - push {r4-r7,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r0, =sub_80DDF80 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r6, r0, 24 - lsls r4, 24 - cmp r4, 0 - ble _080DDF38 - ldr r7, =0x0000237e - lsls r0, r5, 24 - adds r4, r0, 0 - cmp r4, 0 - ble _080DDF1C - movs r5, 0 - ldr r2, =gContestResources - ldr r0, [r2] - ldr r0, [r0] - movs r1, 0x13 - ldrsb r1, [r0, r1] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 24 - lsrs r3, r0, 24 - b _080DDF4E - .pool -_080DDF1C: - ldr r2, =gContestResources - ldr r0, [r2] - ldr r0, [r0] - movs r1, 0x13 - ldrsb r1, [r0, r1] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 24 - lsrs r5, r0, 24 - movs r3, 0 - b _080DDF4E - .pool -_080DDF38: - movs r7, 0 - lsls r0, r5, 24 - adds r4, r0, 0 - cmp r4, 0 - ble _080DDF48 - movs r5, 0 - movs r3, 0xC - b _080DDF4C -_080DDF48: - movs r5, 0xC - movs r3, 0 -_080DDF4C: - ldr r2, =gContestResources -_080DDF4E: - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r1 - strh r7, [r0, 0x8] - strh r5, [r0, 0xA] - asrs r1, r4, 24 - strh r1, [r0, 0xC] - strh r3, [r0, 0xE] - ldr r0, [r2] - ldr r2, [r0] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x7] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDED0 - - thumb_func_start sub_80DDF80 -sub_80DDF80: @ 80DDF80 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r2, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r3, r0, r2 - ldrh r0, [r3, 0x1C] - adds r1, r0, 0x1 - strh r1, [r3, 0x1C] - lsls r0, 16 - cmp r0, 0 - blt _080DDFFC - movs r0, 0 - strh r0, [r3, 0x1C] - movs r1, 0xC - ldrsh r0, [r3, r1] - cmp r0, 0 - ble _080DDFB4 - ldrh r0, [r3, 0xA] - adds r0, 0x1 - b _080DDFB8 - .pool -_080DDFB4: - ldrh r0, [r3, 0xA] - subs r0, 0x1 -_080DDFB8: - strh r0, [r3, 0xA] - lsls r4, r5, 2 - adds r4, r5 - lsls r4, 3 - adds r4, r2 - ldrb r2, [r4, 0xA] - ldrh r3, [r4, 0x8] - movs r0, 0x11 - movs r1, 0x1 - bl BlendPalette - ldrb r2, [r4, 0xA] - ldrh r3, [r4, 0x8] - movs r0, 0x1A - movs r1, 0x1 - bl BlendPalette - movs r2, 0xA - ldrsh r1, [r4, r2] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _080DDFFC - adds r0, r5, 0 - bl DestroyTask - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x7] -_080DDFFC: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DDF80 - - thumb_func_start sub_80DE008 -sub_80DE008: @ 80DE008 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - movs r5, 0 - ldr r0, =gContestResources - mov r9, r0 - mov r8, r9 - ldr r6, =gSprites - movs r4, 0 - movs r7, 0 -_080DE026: - mov r1, r8 - ldr r0, [r1] - ldr r0, [r0, 0x4] - adds r0, r7, r0 - ldrb r1, [r0, 0x10] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _080DE0BC - mov r2, r10 - cmp r2, 0 - beq _080DE0BC - lsls r0, r5, 24 - lsrs r0, 24 - bl sub_80DE0F0 - mov r3, r8 - ldr r1, [r3] - ldr r1, [r1, 0x14] - adds r1, r4, r1 - ldrb r2, [r1, 0x1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r6 - ldrh r1, [r1, 0x4] - lsls r1, 22 - lsrs r1, 17 - ldr r2, =0x060100c0 - adds r1, r2 - ldr r2, =0x04000008 - bl CpuSet - mov r0, r8 - ldr r3, [r0] - ldr r0, [r3, 0x14] - adds r0, r4, r0 - ldrb r0, [r0, 0x1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - ldr r2, =gUnknown_08587A70 - ldr r0, =gUnknown_02039F26 - adds r0, r5, r0 - ldrb r0, [r0] - adds r0, r2 - ldrb r0, [r0] - strh r0, [r1, 0x22] - ldr r0, [r3, 0x14] - adds r0, r4, r0 - ldrb r1, [r0, 0x1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - movs r3, 0x5 - negs r3, r3 - adds r2, r3, 0 - ands r1, r2 - b _080DE0D6 - .pool -_080DE0BC: - mov r1, r9 - ldr r0, [r1] - ldr r0, [r0, 0x14] - adds r0, r4, r0 - ldrb r1, [r0, 0x1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 -_080DE0D6: - strb r1, [r0] - adds r4, 0x4 - adds r7, 0x1C - adds r5, 0x1 - cmp r5, 0x3 - ble _080DE026 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80DE008 - - thumb_func_start sub_80DE0F0 -sub_80DE0F0: @ 80DE0F0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gContestResources - ldr r1, [r1] - ldr r2, [r1, 0x4] - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r2, r1, r2 - ldrb r1, [r2, 0x10] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _080DE120 - ldrb r0, [r2, 0x19] - lsls r0, 5 - ldr r1, =gUnknown_08D8E9B4 - adds r0, r1 - b _080DE122 - .pool -_080DE120: - ldr r0, =gUnknown_08D8EA34 -_080DE122: - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DE0F0 - - thumb_func_start sub_80DE12C -sub_80DE12C: @ 80DE12C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - movs r7, 0 - movs r0, 0x2 - mov r10, r0 - movs r0, 0x1 - mov r8, r0 - movs r0, 0x11 - mov r9, r0 -_080DE146: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0, 0x8] - adds r0, 0xD - adds r0, r7 - ldrb r0, [r0] - cmp r0, 0 - beq _080DE1CA - lsls r0, r7, 24 - lsrs r0, 24 - bl Contest_IsMonsTurnDisabled - lsls r0, 24 - cmp r0, 0 - bne _080DE1CA - ldr r0, =gUnknown_02039F26 - adds r0, r7, r0 - ldrb r0, [r0] - lsls r5, r0, 2 - adds r5, r0 - adds r6, r5, 0x2 - movs r0, 0x3 - bl sub_80DB748 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - lsls r6, 24 - lsrs r6, 24 - mov r0, r10 - str r0, [sp] - mov r0, r8 - str r0, [sp, 0x4] - mov r0, r9 - str r0, [sp, 0x8] - mov r0, r8 - str r0, [sp, 0xC] - movs r0, 0 - adds r1, r4, 0 - movs r2, 0x14 - adds r3, r6, 0 - bl ContestBG_FillBoxWithIncrementingTile - adds r4, 0x10 - lsls r4, 16 - lsrs r4, 16 - adds r5, 0x3 - lsls r5, 24 - lsrs r5, 24 - mov r0, r10 - str r0, [sp] - mov r0, r8 - str r0, [sp, 0x4] - mov r0, r9 - str r0, [sp, 0x8] - mov r0, r8 - str r0, [sp, 0xC] - movs r0, 0 - adds r1, r4, 0 - movs r2, 0x14 - adds r3, r5, 0 - bl ContestBG_FillBoxWithIncrementingTile - movs r0, 0x63 - bl PlaySE -_080DE1CA: - adds r7, 0x1 - cmp r7, 0x3 - ble _080DE146 - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE12C - - thumb_func_start sub_80DE1E8 -sub_80DE1E8: @ 80DE1E8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gContestResources - ldr r1, [r1] - ldr r2, [r1, 0x4] - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r2, r1, r2 - ldrb r1, [r2, 0x15] - movs r3, 0x1 - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - bne _080DE212 - ldrb r1, [r2, 0xC] - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _080DE21C -_080DE212: - movs r0, 0 - b _080DE21E - .pool -_080DE21C: - movs r0, 0x1 -_080DE21E: - pop {r1} - bx r1 - thumb_func_end sub_80DE1E8 - - thumb_func_start sub_80DE224 -sub_80DE224: @ 80DE224 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - movs r0, 0xA - bl GetGpuReg - mov r1, sp - strh r0, [r1] - mov r2, sp - ldrb r1, [r2] - movs r4, 0x4 - negs r4, r4 - adds r0, r4, 0 - ands r0, r1 - strb r0, [r2] - ldrb r1, [r2, 0x1] - movs r0, 0x3F - ands r0, r1 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x1] - ldrb r1, [r2, 0x1] - movs r0, 0x21 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x1] - ldrb r1, [r2] - movs r0, 0xD - negs r0, r0 - mov r8, r0 - ands r0, r1 - strb r0, [r2] - mov r0, sp - ldrh r1, [r0] - movs r0, 0xA - bl SetGpuReg - movs r0, 0x8 - bl GetGpuReg - mov r6, sp - adds r6, 0x2 - strh r0, [r6] - movs r0, 0xC - bl GetGpuReg - add r5, sp, 0x4 - strh r0, [r5] - ldrb r1, [r6] - adds r0, r4, 0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r6] - ldrb r0, [r5] - ands r4, r0 - orrs r4, r1 - strb r4, [r5] - ldrh r1, [r6] - movs r0, 0x8 - bl SetGpuReg - ldrh r1, [r5] - movs r0, 0xC - bl SetGpuReg - ldr r1, =gBattle_BG1_X - movs r0, 0xF0 - strh r0, [r1] - ldr r4, =gBattle_BG1_Y - movs r0, 0xA0 - strh r0, [r4] - movs r0, 0x14 - movs r1, 0xF0 - bl SetGpuReg - ldrh r1, [r4] - movs r0, 0x16 - bl SetGpuReg - movs r0, 0 - str r0, [sp, 0x8] - add r0, sp, 0x8 - ldr r4, =gContestResources - ldr r1, [r4] - ldr r1, [r1, 0x28] - ldr r2, =0x05000400 - bl CpuSet - ldr r1, =gUnknown_08C17980 - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - movs r0, 0x1 - bl Contest_SetBgCopyFlags - movs r5, 0 - ldr r7, =gSprites - movs r6, 0x4 -_080DE2F0: - ldr r0, [r4] - ldr r0, [r0, 0x14] - lsls r3, r5, 2 - adds r0, r3, r0 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - ldrb r2, [r1, 0x5] - mov r0, r8 - ands r0, r2 - orrs r0, r6 - strb r0, [r1, 0x5] - ldr r0, [r4] - ldr r0, [r0, 0x14] - adds r3, r0 - ldrb r0, [r3, 0x1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - ldrb r2, [r1, 0x5] - mov r0, r8 - ands r0, r2 - orrs r0, r6 - strb r0, [r1, 0x5] - adds r5, 0x1 - cmp r5, 0x3 - ble _080DE2F0 - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE224 - - thumb_func_start sub_80DE350 -sub_80DE350: @ 80DE350 - push {r4-r7,lr} - sub sp, 0x8 - ldr r1, =0x06008000 - movs r2, 0x80 - lsls r2, 6 - movs r0, 0 - movs r3, 0x1 - bl RequestDma3Fill - movs r5, 0 - str r5, [sp] - ldr r6, =gContestResources - ldr r0, [r6] - ldr r1, [r0, 0x28] - ldr r2, =0x05000400 - mov r0, sp - bl CpuSet - movs r0, 0x1 - bl Contest_SetBgCopyFlags - movs r0, 0xA - bl GetGpuReg - add r3, sp, 0x4 - strh r0, [r3] - ldrb r1, [r3] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r3] - mov r1, sp - adds r1, 0x5 - ldrb r2, [r1] - movs r0, 0x3F - ands r0, r2 - strb r0, [r1] - ldrb r2, [r1] - movs r0, 0x21 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldrb r1, [r3] - movs r4, 0xD - negs r4, r4 - adds r0, r4, 0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r3] - ldrh r1, [r3] - movs r0, 0xA - bl SetGpuReg - ldr r0, =gBattle_BG1_X - strh r5, [r0] - ldr r0, =gBattle_BG1_Y - strh r5, [r0] - ldr r7, =gSprites -_080DE3CA: - ldr r0, [r6] - ldr r0, [r0, 0x14] - lsls r3, r5, 2 - adds r0, r3, r0 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - ldrb r2, [r1, 0x5] - adds r0, r4, 0 - ands r0, r2 - strb r0, [r1, 0x5] - ldr r0, [r6] - ldr r0, [r0, 0x14] - adds r3, r0 - ldrb r0, [r3, 0x1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - ldrb r2, [r1, 0x5] - adds r0, r4, 0 - ands r0, r2 - strb r0, [r1, 0x5] - adds r5, 0x1 - cmp r5, 0x3 - ble _080DE3CA - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE350 - - thumb_func_start sub_80DE424 -sub_80DE424: @ 80DE424 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r1, =gBattle_BG1_X - movs r0, 0 - strh r0, [r1] - ldr r1, =gBattle_BG1_Y - movs r0, 0xA0 - strh r0, [r1] - movs r0, 0x62 - movs r1, 0 - bl PlaySE12WithPanning - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_80DE464 - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE424 - - thumb_func_start sub_80DE464 -sub_80DE464: @ 80DE464 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r1, =gBattle_BG1_Y - ldrh r0, [r1] - subs r0, 0x7 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - bge _080DE47C - movs r0, 0 - strh r0, [r1] -_080DE47C: - ldrh r2, [r1] - cmp r2, 0 - bne _080DE496 - ldr r0, =gTasks - lsls r1, r3, 2 - adds r1, r3 - lsls r1, 3 - adds r1, r0 - strh r2, [r1, 0x8] - strh r2, [r1, 0xA] - strh r2, [r1, 0xC] - ldr r0, =sub_80DE4A8 - str r0, [r1] -_080DE496: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE464 - - thumb_func_start sub_80DE4A8 -sub_80DE4A8: @ 80DE4A8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, =gTasks - lsls r3, r4, 2 - adds r0, r3, r4 - lsls r0, 3 - adds r5, r0, r1 - movs r0, 0x8 - ldrsh r1, [r5, r0] - cmp r1, 0x1 - beq _080DE52C - cmp r1, 0x1 - bgt _080DE4D0 - cmp r1, 0 - beq _080DE4DA - b _080DE5B4 - .pool -_080DE4D0: - cmp r1, 0x2 - beq _080DE58A - cmp r1, 0x3 - beq _080DE5A4 - b _080DE5B4 -_080DE4DA: - movs r2, 0 - adds r6, r3, 0 - ldr r5, =gContestResources - ldr r3, =gUnknown_02039F26 -_080DE4E2: - ldr r0, [r5] - ldr r1, [r0] - adds r1, 0x14 - adds r1, r2 - adds r0, r2, r3 - ldrb r0, [r0] - strb r0, [r1] - adds r2, 0x1 - cmp r2, 0x3 - ble _080DE4E2 - bl sub_80DBF90 - bl sub_80DC864 - bl sub_80DB69C - bl sub_80DD04C - movs r0, 0x1 - bl sub_80DE008 - bl sub_80DC44C - ldr r0, =gTasks - adds r1, r6, r4 - lsls r1, 3 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x8] - b _080DE5B4 - .pool -_080DE52C: - ldr r0, =gIsLinkContest - ldrb r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _080DE584 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r0, [r2, 0x7] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2, 0x7] - bl sub_80DA8A4 - lsls r0, 24 - cmp r0, 0 - beq _080DE552 - bl sub_80DBAA0 -_080DE552: - ldr r4, =sub_80FCC88 - adds r0, r4, 0 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =sub_80DA110 - adds r1, r4, 0 - bl SetTaskFuncWithFollowupFunc - bl sub_80DBF68 - movs r0, 0x2 - strh r0, [r5, 0x8] - b _080DE5B4 - .pool -_080DE584: - bl sub_80DBAA0 - b _080DE59A -_080DE58A: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - ldrb r1, [r0, 0x7] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - bne _080DE5B4 -_080DE59A: - movs r0, 0x3 - strh r0, [r5, 0x8] - b _080DE5B4 - .pool -_080DE5A4: - bl sub_80DB884 - bl sub_80DB2BC - movs r0, 0 - strh r0, [r5, 0x8] - ldr r0, =sub_80DE5F4 - str r0, [r5] -_080DE5B4: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE4A8 - - thumb_func_start sub_80DE5C0 -sub_80DE5C0: @ 80DE5C0 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, =gBattle_BG1_Y - ldrh r0, [r1] - adds r0, 0x7 - strh r0, [r1] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA0 - ble _080DE5E4 - ldr r0, =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_80DA4F4 - str r0, [r1] -_080DE5E4: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE5C0 - - thumb_func_start sub_80DE5F4 -sub_80DE5F4: @ 80DE5F4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0x9 - bgt _080DE618 - adds r0, r2, 0x1 - strh r0, [r1, 0xC] - b _080DE654 - .pool -_080DE618: - ldrh r3, [r1, 0xA] - movs r4, 0xA - ldrsh r0, [r1, r4] - cmp r0, 0 - bne _080DE636 - ldrh r2, [r1, 0x8] - movs r4, 0x8 - ldrsh r0, [r1, r4] - cmp r0, 0x10 - bne _080DE632 - adds r0, r3, 0x1 - strh r0, [r1, 0xA] - b _080DE654 -_080DE632: - adds r0, r2, 0x1 - b _080DE652 -_080DE636: - ldrh r0, [r1, 0x8] - movs r3, 0x8 - ldrsh r2, [r1, r3] - cmp r2, 0 - bne _080DE650 - strh r2, [r1, 0xA] - strh r2, [r1, 0xC] - ldr r0, =sub_80DE65C - str r0, [r1] - b _080DE654 - .pool -_080DE650: - subs r0, 0x1 -_080DE652: - strh r0, [r1, 0x8] -_080DE654: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DE5F4 - - thumb_func_start sub_80DE65C -sub_80DE65C: @ 80DE65C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r1, [r4, 0xC] - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r0, 0x9 - bgt _080DE680 - adds r0, r1, 0x1 - strh r0, [r4, 0xC] - b _080DE690 - .pool -_080DE680: - movs r0, 0 - strh r0, [r4, 0xC] - movs r0, 0x61 - movs r1, 0 - bl PlaySE12WithPanning - ldr r0, =sub_80DE5C0 - str r0, [r4] -_080DE690: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE65C - - thumb_func_start sub_80DE69C -sub_80DE69C: @ 80DE69C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r7, 0 - ldr r6, =gSprites - ldr r5, =gContestResources -_080DE6AE: - bl AllocOamMatrix - ldr r1, [r5] - ldr r1, [r1, 0x14] - lsls r4, r7, 2 - adds r1, r4, r1 - ldrb r1, [r1] - lsls r3, r1, 4 - adds r3, r1 - lsls r3, 2 - adds r3, r6 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1F - ands r0, r1 - lsls r0, 1 - ldrb r1, [r3, 0x3] - movs r2, 0x3F - negs r2, r2 - mov r12, r2 - mov r2, r12 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0x3] - ldr r0, [r5] - ldr r0, [r0, 0x14] - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - ldrb r2, [r0, 0x1] - movs r3, 0x4 - negs r3, r3 - adds r1, r3, 0 - ands r2, r1 - movs r1, 0x1 - orrs r2, r1 - strb r2, [r0, 0x1] - ldr r0, [r5] - ldr r0, [r0, 0x14] - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - mov r1, r8 - bl StartSpriteAffineAnim - mov r0, r8 - cmp r0, 0x2 - bne _080DE74C - ldr r0, [r5] - ldr r0, [r0, 0x14] - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - bl AnimateSprite - ldr r0, [r5] - ldr r0, [r0, 0x14] - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - movs r3, 0x5 - negs r3, r3 - adds r2, r3, 0 - ands r1, r2 - strb r1, [r0] -_080DE74C: - adds r7, 0x1 - cmp r7, 0x3 - ble _080DE6AE - ldr r0, =sub_80DE794 - movs r1, 0x5 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - mov r0, r8 - strh r0, [r1, 0x8] - ldr r0, =gContestResources - ldr r0, [r0] - ldr r2, [r0] - ldrb r0, [r2, 0x7] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0x7] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE69C - - thumb_func_start sub_80DE794 -sub_80DE794: @ 80DE794 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r2, =gSprites - ldr r3, =gContestResources - ldr r0, [r3] - ldr r0, [r0, 0x14] - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3F - ldrb r0, [r0] - lsls r0, 26 - cmp r0, 0 - bge _080DE822 - ldr r0, =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r1, r0 - ldrb r0, [r1, 0x8] - cmp r0, 0x1 - bne _080DE7EC - movs r4, 0 - adds r5, r2, 0 - movs r2, 0x4 -_080DE7CC: - ldr r0, [r3] - ldr r1, [r0, 0x14] - lsls r0, r4, 2 - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r2 - strb r1, [r0] - adds r4, 0x1 - cmp r4, 0x3 - ble _080DE7CC -_080DE7EC: - movs r4, 0 -_080DE7EE: - ldr r5, =gContestResources - ldr r0, [r5] - ldr r1, [r0, 0x14] - lsls r0, r4, 2 - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl FreeSpriteOamMatrix - adds r4, 0x1 - cmp r4, 0x3 - ble _080DE7EE - ldr r0, [r5] - ldr r2, [r0] - ldrb r1, [r2, 0x7] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x7] - adds r0, r6, 0 - bl DestroyTask -_080DE822: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE794 - - thumb_func_start sub_80DE834 -sub_80DE834: @ 80DE834 - push {lr} - lsls r0, 16 - lsrs r1, r0, 16 - movs r0, 0xB1 - lsls r0, 1 - cmp r1, r0 - bls _080DE844 - movs r1, 0x1 -_080DE844: - adds r0, r1, 0 - pop {r1} - bx r1 - thumb_func_end sub_80DE834 - - thumb_func_start sub_80DE84C -sub_80DE84C: @ 80DE84C - push {lr} - lsls r0, 16 - lsrs r1, r0, 16 - ldr r0, =0x0000019b - cmp r1, r0 - bls _080DE85A - movs r1, 0 -_080DE85A: - adds r0, r1, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DE84C - - thumb_func_start sub_80DE864 -sub_80DE864: @ 80DE864 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r4, =gContestResources - ldr r0, [r4] - ldr r1, [r0, 0x4] - lsls r0, r7, 3 - subs r0, r7 - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0, 0x6] - bl sub_80DE834 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r1, =gContestMons - lsls r0, r7, 6 - adds r0, r1 - ldrh r0, [r0] - bl sub_80DE84C - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, [r4] - ldr r0, [r0, 0x18] - movs r1, 0 - movs r2, 0x14 - bl memset - bl ClearBattleAnimationVars - ldr r1, =gBattleMonForms - movs r2, 0 - adds r0, r1, 0x3 -_080DE8A8: - strb r2, [r0] - subs r0, 0x1 - cmp r0, r1 - bge _080DE8A8 - cmp r5, 0x90 - beq _080DE920 - cmp r5, 0x90 - bgt _080DE8DE - cmp r5, 0x4C - beq _080DE978 - cmp r5, 0x4C - bgt _080DE8D4 - cmp r5, 0xD - beq _080DE978 - b _080DE9A2 - .pool -_080DE8D4: - cmp r5, 0x82 - beq _080DE978 - cmp r5, 0x8F - beq _080DE978 - b _080DE9A2 -_080DE8DE: - cmp r5, 0xD8 - beq _080DE960 - cmp r5, 0xD8 - bgt _080DE8EC - cmp r5, 0xAE - beq _080DE8FA - b _080DE9A2 -_080DE8EC: - cmp r5, 0xDA - beq _080DE96C - movs r0, 0x88 - lsls r0, 1 - cmp r5, r0 - beq _080DE920 - b _080DE9A2 -_080DE8FA: - ldr r0, =gBaseStats - lsls r1, r6, 3 - subs r1, r6 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1, 0x6] - cmp r0, 0x7 - beq _080DE910 - ldrb r0, [r1, 0x7] - cmp r0, 0x7 - bne _080DE99C -_080DE910: - ldr r1, =gAnimMoveTurn - movs r0, 0 - b _080DE9A0 - .pool -_080DE920: - ldr r6, =gContestResources - ldr r0, [r6] - ldr r1, [r0, 0x4] - lsls r0, r7, 3 - subs r0, r7 - lsls r0, 2 - adds r0, r1 - ldrb r4, [r0, 0x1B] - ldr r5, =gContestMons - lsls r4, 6 - adds r0, r4, r5 - ldrh r0, [r0] - bl sub_80DE84C - ldr r2, [r6] - ldr r1, [r2, 0x18] - strh r0, [r1, 0x2] - ldr r2, [r2, 0x18] - adds r5, 0x38 - adds r4, r5 - ldr r0, [r4] - str r0, [r2, 0x10] - ldrb r0, [r2, 0x4] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x4] - b _080DE9A2 - .pool -_080DE960: - ldr r1, =gAnimFriendship - movs r0, 0xFF - b _080DE9A0 - .pool -_080DE96C: - ldr r1, =gAnimFriendship - movs r0, 0 - b _080DE9A0 - .pool -_080DE978: - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0] - adds r2, r0, 0 - adds r2, 0x5A - ldrb r1, [r2] - cmp r1, 0 - bne _080DE99C - movs r0, 0x2 - strb r0, [r2] - ldr r0, =gAnimMoveTurn - strb r1, [r0] - b _080DE9A2 - .pool -_080DE99C: - ldr r1, =gAnimMoveTurn - movs r0, 0x1 -_080DE9A0: - strb r0, [r1] -_080DE9A2: - bl sub_80DEA5C - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE864 - - thumb_func_start sub_80DE9B0 -sub_80DE9B0: @ 80DE9B0 - push {r4,lr} - ldr r4, =gContestResources - ldr r0, [r4] - ldr r0, [r0, 0x18] - movs r1, 0 - movs r2, 0x14 - bl memset - ldr r0, [r4] - ldr r0, [r0] - adds r1, r0, 0 - adds r1, 0x5A - ldrb r0, [r1] - cmp r0, 0 - beq _080DE9D2 - subs r0, 0x1 - strb r0, [r1] -_080DE9D2: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE9B0 - - thumb_func_start sub_80DE9DC -sub_80DE9DC: @ 80DE9DC - push {r4-r6,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r6, =gContestResources - ldr r0, [r6] - ldr r0, [r0, 0x18] - strb r4, [r0, 0x5] - ldr r5, =gContestMons - lsls r4, 6 - adds r0, r4, r5 - ldrh r0, [r0] - bl sub_80DE84C - ldr r2, [r6] - ldr r1, [r2, 0x18] - strh r0, [r1] - ldr r1, [r2, 0x18] - adds r0, r5, 0 - adds r0, 0x38 - adds r0, r4, r0 - ldr r0, [r0] - str r0, [r1, 0x8] - adds r5, 0x3C - adds r4, r5 - ldr r0, [r4] - str r0, [r1, 0xC] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DE9DC - - thumb_func_start sub_80DEA20 -sub_80DEA20: @ 80DEA20 - push {lr} - ldr r0, =SpriteCallbackDummy - bl CreateInvisibleSpriteWithCallback - ldr r1, =gBattlerSpriteIds - strb r0, [r1, 0x3] - ldr r0, =gBattlerTarget - ldrb r0, [r0] - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl InitSpriteAffineAnim - bl sub_80DEA5C - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DEA20 - - thumb_func_start sub_80DEA5C -sub_80DEA5C: @ 80DEA5C - push {r4,lr} - ldr r0, =gBattlerSpriteIds - ldrb r0, [r0, 0x3] - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - movs r0, 0 - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0x3 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x20] - movs r0, 0x3 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - adds r4, 0x3E - ldrb r0, [r4] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DEA5C - - thumb_func_start sub_80DEAA8 -sub_80DEAA8: @ 80DEAA8 - push {lr} - lsls r0, 16 - lsrs r0, 16 - ldr r2, =gBattleMoves - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1, 0x6] - cmp r0, 0x20 - bhi _080DEB60 - lsls r0, 2 - ldr r1, =_080DEAD0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080DEAD0: - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB54 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB54 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 -_080DEB54: - ldr r1, =gBattlerTarget - movs r0, 0x2 - b _080DEB64 - .pool -_080DEB60: - ldr r1, =gBattlerTarget - movs r0, 0x3 -_080DEB64: - strb r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DEAA8 - - thumb_func_start Contest_PrintTextToBg0WindowStd -Contest_PrintTextToBg0WindowStd: @ 80DEB70 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - str r1, [sp] - mov r0, sp - movs r2, 0 - strb r4, [r0, 0x4] - movs r1, 0x1 - strb r1, [r0, 0x5] - strb r2, [r0, 0x6] - strb r1, [r0, 0x7] - strb r2, [r0, 0x8] - strb r1, [r0, 0x9] - strb r2, [r0, 0xA] - strb r2, [r0, 0xB] - mov r3, sp - ldrb r2, [r3, 0xC] - subs r1, 0x11 - adds r0, r1, 0 - ands r0, r2 - strb r0, [r3, 0xC] - mov r2, sp - movs r0, 0xF0 - strb r0, [r2, 0xC] - ldrb r0, [r2, 0xD] - ands r1, r0 - strb r1, [r2, 0xD] - mov r1, sp - movs r0, 0x80 - strb r0, [r1, 0xD] - mov r0, sp - movs r1, 0 - movs r2, 0 - bl AddTextPrinter - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl PutWindowTilemap - movs r0, 0 - bl Contest_SetBgCopyFlags - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - thumb_func_end Contest_PrintTextToBg0WindowStd - - thumb_func_start Contest_PrintTextToBg0WindowAt -Contest_PrintTextToBg0WindowAt: @ 80DEBD0 - push {r4,r5,lr} - sub sp, 0x10 - adds r5, r0, 0 - ldr r4, [sp, 0x1C] - str r1, [sp] - mov r0, sp - movs r1, 0 - strb r5, [r0, 0x4] - strb r4, [r0, 0x5] - strb r2, [r0, 0x6] - strb r3, [r0, 0x7] - strb r2, [r0, 0x8] - strb r3, [r0, 0x9] - strb r1, [r0, 0xA] - strb r1, [r0, 0xB] - mov r3, sp - ldrb r2, [r3, 0xC] - subs r1, 0x10 - adds r0, r1, 0 - ands r0, r2 - strb r0, [r3, 0xC] - mov r2, sp - movs r0, 0xF0 - strb r0, [r2, 0xC] - ldrb r0, [r2, 0xD] - ands r1, r0 - strb r1, [r2, 0xD] - mov r1, sp - movs r0, 0x80 - strb r0, [r1, 0xD] - mov r0, sp - movs r1, 0 - movs r2, 0 - bl AddTextPrinter - lsls r5, 24 - lsrs r5, 24 - adds r0, r5, 0 - bl PutWindowTilemap - movs r0, 0 - bl Contest_SetBgCopyFlags - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end Contest_PrintTextToBg0WindowAt - - thumb_func_start Contest_StartTextPrinter -Contest_StartTextPrinter: @ 80DEC30 - push {r4,r5,lr} - sub sp, 0x10 - str r0, [sp] - mov r2, sp - movs r3, 0 - movs r0, 0x4 - strb r0, [r2, 0x4] - mov r0, sp - movs r5, 0x1 - strb r5, [r0, 0x5] - strb r3, [r0, 0x6] - strb r5, [r0, 0x7] - strb r3, [r0, 0x8] - strb r5, [r0, 0x9] - strb r3, [r0, 0xA] - strb r3, [r0, 0xB] - mov r4, sp - ldrb r3, [r4, 0xC] - movs r2, 0x10 - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - strb r0, [r4, 0xC] - mov r3, sp - movs r0, 0x10 - strb r0, [r3, 0xC] - ldrb r0, [r3, 0xD] - ands r2, r0 - strb r2, [r3, 0xD] - mov r2, sp - movs r0, 0x80 - strb r0, [r2, 0xD] - cmp r1, 0 - bne _080DEC80 - mov r0, sp - movs r1, 0 - movs r2, 0 - bl AddTextPrinter - b _080DECA4 -_080DEC80: - ldr r0, =gIsLinkContest - ldrb r1, [r0] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - beq _080DEC94 - movs r1, 0x4 - b _080DEC9C - .pool -_080DEC94: - bl GetPlayerTextSpeedDelay - lsls r0, 24 - lsrs r1, r0, 24 -_080DEC9C: - mov r0, sp - movs r2, 0 - bl AddTextPrinter -_080DECA4: - movs r0, 0x4 - bl PutWindowTilemap - movs r0, 0 - bl Contest_SetBgCopyFlags - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end Contest_StartTextPrinter - - thumb_func_start ContestBG_FillBoxWithIncrementingTile -ContestBG_FillBoxWithIncrementingTile: @ 80DECB8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - mov r8, r0 - ldr r0, [sp, 0x28] - ldr r4, [sp, 0x2C] - ldr r5, [sp, 0x30] - ldr r6, [sp, 0x34] - mov r7, r8 - lsls r7, 24 - lsrs r7, 24 - mov r8, r7 - lsls r1, 16 - lsrs r1, 16 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r0, 24 - lsrs r0, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - str r0, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - lsls r6, 16 - asrs r6, 16 - str r6, [sp, 0xC] - mov r0, r8 - bl WriteSequenceToBgTilemapBuffer - mov r0, r8 - bl Contest_SetBgCopyFlags - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end ContestBG_FillBoxWithIncrementingTile - - thumb_func_start ContestBG_FillBoxWithTile -ContestBG_FillBoxWithTile: @ 80DED10 - push {r4-r6,lr} - sub sp, 0x10 - ldr r4, [sp, 0x20] - ldr r5, [sp, 0x24] - ldr r6, [sp, 0x28] - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsrs r1, 16 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - str r4, [sp] - str r5, [sp, 0x4] - str r6, [sp, 0x8] - movs r4, 0 - str r4, [sp, 0xC] - bl ContestBG_FillBoxWithIncrementingTile - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end ContestBG_FillBoxWithTile - - thumb_func_start Contest_RunTextPrinters -Contest_RunTextPrinters: @ 80DED4C - push {lr} - bl RunTextPrinters - movs r0, 0x4 - bl IsTextPrinterActive - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Contest_RunTextPrinters - - thumb_func_start Contest_SetBgCopyFlags -Contest_SetBgCopyFlags: @ 80DED60 - ldr r2, =sContestBgCopyFlags - movs r1, 0x1 - lsls r1, r0 - ldrb r0, [r2] - orrs r1, r0 - strb r1, [r2] - bx lr - .pool - thumb_func_end Contest_SetBgCopyFlags - - thumb_func_start ResetContestLinkResults -ResetContestLinkResults: @ 80DED74 - push {r4-r6,lr} - movs r0, 0 - ldr r6, =gSaveBlock2Ptr - ldr r5, =0x00000624 - movs r4, 0 -_080DED7E: - adds r3, r0, 0x1 - lsls r1, r0, 3 - movs r2, 0x3 -_080DED84: - ldr r0, [r6] - adds r0, r5 - adds r0, r1 - strh r4, [r0] - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bge _080DED84 - adds r0, r3, 0 - cmp r0, 0x4 - ble _080DED7E - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end ResetContestLinkResults - - thumb_func_start sub_80DEDA8 -sub_80DEDA8: @ 80DEDA8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r5, 0 - ldr r1, =gContestFinalStandings - ldrb r0, [r1] - cmp r0, 0 - beq _080DEDE6 -_080DEDD8: - adds r5, 0x1 - cmp r5, 0x2 - bgt _080DEDE6 - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080DEDD8 -_080DEDE6: - ldr r0, [sp] - cmp r0, 0xFF - bne _080DEE00 - ldr r0, =gContestPlayerMonIndex - ldrb r0, [r0] - cmp r5, r0 - beq _080DEE00 - movs r0, 0 - b _080DEF90 - .pool -_080DEE00: - ldr r0, =gSpecialVar_ContestCategory - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080DEE4C - lsls r0, 2 - ldr r1, =_080DEE1C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080DEE1C: - .4byte _080DEE4C - .4byte _080DEE30 - .4byte _080DEE36 - .4byte _080DEE3C - .4byte _080DEE42 -_080DEE30: - mov r0, r8 - adds r0, 0x3 - b _080DEE46 -_080DEE36: - mov r0, r8 - adds r0, 0x6 - b _080DEE46 -_080DEE3C: - mov r0, r8 - adds r0, 0x9 - b _080DEE46 -_080DEE42: - mov r0, r8 - adds r0, 0xC -_080DEE46: - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 -_080DEE4C: - ldr r1, [sp] - cmp r1, 0xFE - bne _080DEE54 - b _080DEF50 -_080DEE54: - adds r0, r1, 0 - movs r1, 0x1 - bl sub_80DEFA8 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r2, =gSaveBlock1Ptr - mov r10, r2 - ldr r0, [r2] - mov r3, r9 - lsls r7, r3, 5 - ldr r6, =0x00002e90 - adds r2, r0, r6 - adds r2, r7 - ldr r4, =gContestMons - lsls r5, 6 - adds r1, r4, 0 - adds r1, 0x38 - adds r1, r5, r1 - ldr r1, [r1] - str r1, [r2] - adds r1, r0, r7 - adds r2, r5, r4 - ldrh r2, [r2] - ldr r3, =0x00002e98 - adds r1, r3 - strh r2, [r1] - ldr r1, =0x00002e94 - adds r2, r0, r1 - adds r2, r7 - adds r1, r4, 0 - adds r1, 0x3C - adds r1, r5, r1 - ldr r1, [r1] - str r1, [r2] - adds r6, r7, r6 - adds r0, r6 - adds r0, 0xB - adds r1, r4, 0x2 - adds r1, r5, r1 - bl StringCopy - mov r2, r10 - ldr r0, [r2] - adds r0, r6 - adds r0, 0x16 - adds r4, 0xD - adds r5, r4 - adds r1, r5, 0 - bl StringCopy - ldr r0, =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080DEEF4 - mov r3, r10 - ldr r0, [r3] - adds r0, r7 - ldr r1, =0x00002eae - adds r0, r1 - movs r1, 0x4 - b _080DEF02 - .pool -_080DEEF4: - mov r2, r10 - ldr r0, [r2] - adds r0, r7 - ldr r1, =gSpecialVar_ContestRank - ldrh r1, [r1] - ldr r3, =0x00002eae - adds r0, r3 -_080DEF02: - strb r1, [r0] - ldr r0, [sp] - cmp r0, 0xFF - beq _080DEF34 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - mov r2, r9 - lsls r1, r2, 5 - adds r0, r1 - ldr r1, =gSpecialVar_ContestCategory - ldrh r1, [r1] - ldr r3, =0x00002e9a - adds r0, r3 - strb r1, [r0] - b _080DEF8E - .pool -_080DEF34: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - mov r2, r9 - lsls r1, r2, 5 - adds r0, r1 - ldr r3, =0x00002e9a - adds r0, r3 - mov r1, r8 - strb r1, [r0] - b _080DEF8E - .pool -_080DEF50: - ldr r6, =gUnknown_02039F3C - ldr r4, =gContestMons - lsls r5, 6 - adds r0, r4, 0 - adds r0, 0x38 - adds r0, r5, r0 - ldr r0, [r0] - str r0, [r6] - adds r0, r4, 0 - adds r0, 0x3C - adds r0, r5, r0 - ldr r0, [r0] - str r0, [r6, 0x4] - adds r0, r5, r4 - ldrh r0, [r0] - strh r0, [r6, 0x8] - adds r0, r6, 0 - adds r0, 0xB - adds r1, r4, 0x2 - adds r1, r5, r1 - bl StringCopy - adds r0, r6, 0 - adds r0, 0x16 - adds r4, 0xD - adds r5, r4 - adds r1, r5, 0 - bl StringCopy - mov r2, r8 - strb r2, [r6, 0xA] -_080DEF8E: - movs r0, 0x1 -_080DEF90: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80DEDA8 - - thumb_func_start sub_80DEFA8 -sub_80DEFA8: @ 80DEFA8 - push {r4-r7,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - cmp r0, 0x3 - bgt _080DEFF8 - cmp r0, 0 - blt _080DEFF8 - cmp r1, 0 - beq _080DEFE6 - movs r2, 0x5 - ldr r0, =gSaveBlock1Ptr - mov r12, r0 - ldr r4, =0x00002e90 - ldr r3, =0x00002e70 -_080DEFC8: - mov r1, r12 - ldr r0, [r1] - lsls r1, r2, 5 - adds r1, r0 - adds r0, r1, r4 - adds r1, r3 - ldm r1!, {r5-r7} - stm r0!, {r5-r7} - ldm r1!, {r5-r7} - stm r0!, {r5-r7} - ldm r1!, {r5,r6} - stm r0!, {r5,r6} - subs r2, 0x1 - cmp r2, 0 - bgt _080DEFC8 -_080DEFE6: - movs r0, 0 - b _080DF03A - .pool -_080DEFF8: - ldr r0, =gSpecialVar_ContestCategory - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080DF038 - lsls r0, 2 - ldr r1, =_080DF014 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080DF014: - .4byte _080DF028 - .4byte _080DF02C - .4byte _080DF030 - .4byte _080DF034 - .4byte _080DF038 -_080DF028: - movs r0, 0x8 - b _080DF03A -_080DF02C: - movs r0, 0x9 - b _080DF03A -_080DF030: - movs r0, 0xA - b _080DF03A -_080DF034: - movs r0, 0xB - b _080DF03A -_080DF038: - movs r0, 0xC -_080DF03A: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80DEFA8 - - thumb_func_start ClearContestWinnerPicsInContestHall -ClearContestWinnerPicsInContestHall: @ 80DF040 - push {r4-r7,lr} - movs r2, 0 - ldr r0, =gSaveBlock1Ptr - mov r12, r0 - ldr r4, =0x00002e90 - ldr r3, =gUnknown_08587FA4 -_080DF04C: - mov r1, r12 - ldr r0, [r1] - lsls r1, r2, 5 - adds r0, r1 - adds r0, r4 - adds r1, r3, 0 - ldm r1!, {r5-r7} - stm r0!, {r5-r7} - ldm r1!, {r5-r7} - stm r0!, {r5-r7} - ldm r1!, {r5,r6} - stm r0!, {r5,r6} - adds r3, 0x20 - adds r2, 0x1 - cmp r2, 0x7 - ble _080DF04C - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end ClearContestWinnerPicsInContestHall - thumb_func_start sub_80DF080 sub_80DF080: @ 80DF080 push {r4-r7,lr} diff --git a/data/contest.s b/data/contest.s index eaf3f8c951..48bfa10803 100644 --- a/data/contest.s +++ b/data/contest.s @@ -406,7 +406,7 @@ gSpriteTemplate_858998C:: @ 858998C spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy .align 2 -gUnknown_085899EC:: @ 85899EC +gContestExcitementTable:: @ 85899EC .2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000 diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 737e4b8625..1406ba3cbf 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -665,19 +665,19 @@ gText_0827E817:: @ 827E817 .string "{STR_VAR_1}'s\n" .string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" -gText_0827E837:: @ 827E837 +gText_Contest_Shyness:: @ 827E837 .string "shyness$" -gText_0827E83F:: @ 827E83F +gText_Contest_Anxiety:: @ 827E83F .string "anxiety$" -gText_0827E847:: @ 827E847 +gText_Contest_Laziness:: @ 827E847 .string "laziness$" -gText_0827E850:: @ 827E850 +gText_Contest_Hesitancy:: @ 827E850 .string "hesitancy$" -gText_0827E85A:: @ 827E85A +gText_Contest_Fear:: @ 827E85A .string "fear$" gText_0827E85F:: @ 827E85F diff --git a/include/contest.h b/include/contest.h index 4ab4d350c5..65db7b0bc5 100644 --- a/include/contest.h +++ b/include/contest.h @@ -429,9 +429,13 @@ extern struct ContestResources *gContestResources; #define shared19328 (*gContestResources->field_10) #define shared19338 (*gContestResources->field_14) + + #define shared15800 (gHeap + 0x18000) +#define shared16800 (gHeap + 0x19000) #define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000)) + extern u32 gContestRngValue; extern u8 gUnknown_02039F26[4]; @@ -445,7 +449,7 @@ bool8 sub_80DE1E8(u8 a); void SetStartledString(u8 a, u8 b); s8 Contest_GetMoveExcitement(u16); u8 sub_80DAE0C(struct Pokemon *); -void sub_80DEDA8(u8); +bool8 sub_80DEDA8(u8); void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame); void sub_80DB09C(u8 contestCategory); void sub_80DCE58(u8); diff --git a/include/graphics.h b/include/graphics.h index 29719d1a06..4615facf95 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4745,9 +4745,13 @@ extern const u32 gBattleStatMask8_Pal[]; extern const u32 gUnknown_08D9A88C[]; extern const u32 gContestMiscGfx[]; extern const u32 gContestAudienceGfx[]; +extern const u8 gContestApplauseMeterGfx[]; +extern const u8 gContestNextTurnNumbersGfx[]; +extern const u8 gContestNextTurnRandomGfx[]; extern const u32 gUnknown_08C16FA8[]; extern const u32 gUnknown_08C16E90[]; extern const u32 gUnknown_08C17170[]; +extern const u32 gUnknown_08C17980[]; extern const u32 gUnknown_08D95E00[]; extern const u32 gUnknown_08D960D0[]; diff --git a/src/contest.c b/src/contest.c index a0b44e331e..a74e2c96b6 100644 --- a/src/contest.c +++ b/src/contest.c @@ -103,7 +103,7 @@ u8 sub_80DB120(void); u8 sub_80DB174(u16, u32, u32, u32); void sub_80DB2BC(void); void prints_contest_move_description(u16); -u16 sub_80DE84C(u16); +u16 SanitizeSpecies(u16); void sub_80DB89C(void); u16 GetChosenMove(u8); void sub_80DB918(void); @@ -129,7 +129,7 @@ void sub_80DE424(u8); void sub_80DE69C(u8); void sub_80DEA20(void); void Contest_PrintTextToBg0WindowAt(u32, u8 *, s32, u8, u8); -void Contest_StartTextPrinter(const u8 *, u8); +void Contest_StartTextPrinter(const u8 *, u32); void ContestBG_FillBoxWithIncrementingTile(u8, u16, u8, u8, u8, u8, u8, u8); bool32 Contest_RunTextPrinters(void); void Contest_SetBgCopyFlags(u32); @@ -144,9 +144,9 @@ void sub_80DF750(void); void sub_80DE9DC(u8); void sub_80DCBE8(u8, u8); u8 sub_80DC9EC(u8); -u16 sub_80DE834(u16); +u16 SanitizeMove(u16); void sub_80DE864(u8); -void sub_80DEAA8(u16); +void SelectContestMoveBankTarget(u16); void sub_80DE9B0(u8); void sub_80DC674(u8); void sub_80DE12C(void); @@ -169,7 +169,7 @@ bool8 sub_80DC3C4(void); void sub_80DF9D4(u8 *); void sub_80DF9E0(u8 *, s32); void ContestBG_FillBoxWithTile(u8, u16, u8, u8, u8, u8, u8); -void Contest_PrintTextToBg0WindowStd(u8, const u8 *); +void Contest_PrintTextToBg0WindowStd(u32, const u8 *); s16 sub_80DBD34(u8); void DetermineFinalStandings(void); bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *); @@ -180,7 +180,23 @@ void sub_80DC6A4(u8); void sub_80DC8D0(u8); void sub_80DC81C(u8); void sub_80DC87C(u8); - +void sub_80DCC84(struct Sprite *); +void sub_80DCCD8(struct Sprite *sprite); +u8 sub_80DDA20(void); +void c3_08130B10(u8); +void sub_80DDB6C(u8); +void task08_080CD1CC(u8); +void sub_80DDD20(u8); +void sub_80DDE30(u8); +void sub_80DDF80(u8); +const u8 *GetTurnOrderNumberGfx(u8); +void sub_80DE464(u8); +void sub_80DE4A8(u8); +void sub_80DE5F4(u8); +void sub_80DE65C(u8); +void sub_80DE794(u8); +void sub_80DEA5C(void); +u8 sub_80DEFA8(u8, u8); EWRAM_DATA struct ContestPokemon gContestMons[4] = {0}; @@ -228,6 +244,12 @@ extern const u8 gText_0827E817[]; extern const u8 gText_0827E58A[]; extern const u8 gText_0827D56F[]; extern const u8 gText_0827D597[]; +extern const u8 gText_Contest_Shyness[]; +extern const u8 gText_Contest_Anxiety[]; +extern const u8 gText_Contest_Laziness[]; +extern const u8 gText_Contest_Hesitancy[]; +extern const u8 gText_Contest_Fear[]; +extern const u8 *const gUnknown_08587E10[]; extern const struct ContestPokemon gContestOpponents[96]; extern const u8 gUnknown_085898A4[96]; extern const struct CompressedSpriteSheet gUnknown_08587C00; @@ -249,6 +271,10 @@ extern const struct SubspriteTable gSubspriteTables_8587B80[]; extern const struct CompressedSpriteSheet gUnknown_08587BB0; extern const struct SpritePalette gUnknown_08587BB8; extern const struct SpriteTemplate gSpriteTemplate_8587BC8; +extern bool8 gUnknown_020322D5; +extern void (*const gContestEffectFuncs[])(void); +extern const s8 gContestExcitementTable[][5]; +extern const struct ContestWinner gUnknown_08587FA4[]; void TaskDummy1(u8 taskId) { @@ -1071,11 +1097,11 @@ void sub_80D8B38(u8 taskId) return; case 7: { - u16 move = sub_80DE834(gContestResources->field_4[gContestResources->field_0->unk19215].currMove); + u16 move = SanitizeMove(gContestResources->field_4[gContestResources->field_0->unk19215].currMove); sub_80DE864(gContestResources->field_0->unk19215); sub_80DE9DC(gContestResources->field_0->unk19215); - sub_80DEAA8(move); + SelectContestMoveBankTarget(move); DoMoveAnim(move); gTasks[taskId].data[0] = 8; } @@ -2531,7 +2557,7 @@ u8 sub_80DB120(void) u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index) { u8 spriteId; - species = sub_80DE84C(species); + species = SanitizeSpecies(species); if (index == gContestPlayerMonIndex) HandleLoadSpecialPokePic_2(gMonBackPicTable + species, gMonSpritesGfxPtr->sprites[0], species, personality); @@ -2776,9 +2802,9 @@ void sub_80DB884(void) void sub_80DB89C(void) { - FillWindowPixelBuffer(4, 0); - CopyWindowToVram(4, 2); - Contest_SetBgCopyFlags(0); + FillWindowPixelBuffer(4, 0); + CopyWindowToVram(4, 2); + Contest_SetBgCopyFlags(0); } u16 GetChosenMove(u8 a) @@ -2796,20 +2822,20 @@ u16 GetChosenMove(u8 a) ContestAI_ResetAI(a); moveChoice = ContestAI_GetActionToUse(); return gContestMons[a].moves[moveChoice]; - } + } } void sub_80DB918(void) { - s32 i; + s32 i; for (i = 0; i < 4; i++) - sContestantStatus[i].currMove = GetChosenMove(i); + sContestantStatus[i].currMove = GetChosenMove(i); } void sub_80DB944(void) { - s32 i; + s32 i; s32 j; s16 arr[4]; @@ -3016,7 +3042,7 @@ void DetermineFinalStandings(void) void sub_80DBED4(void) { - if ((gIsLinkContest & 1)) + if ((gIsLinkContest & 1)) { gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] = ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 0x270F) ? 0x270F : @@ -3027,7 +3053,7 @@ void sub_80DBED4(void) bool8 sub_80DBF30(s32 a, s32 b, struct UnknownContestStruct6 *c) { - bool8 retVal; + bool8 retVal; if (c[a].unk0 < c[b].unk0) retVal = TRUE; @@ -3046,15 +3072,15 @@ bool8 sub_80DBF30(s32 a, s32 b, struct UnknownContestStruct6 *c) void sub_80DBF68(void) { - gBattle_BG0_Y = 0; - gBattle_BG2_Y = 0; - sub_80DB89C(); - Contest_StartTextPrinter((u8*) &gUnknown_0827E8DA, 0); + gBattle_BG0_Y = 0; + gBattle_BG2_Y = 0; + sub_80DB89C(); + Contest_StartTextPrinter((u8*) &gUnknown_0827E8DA, 0); } void sub_80DBF90(void) { - int i; + int i; for(i = 0; i < 4; i++) { @@ -3106,7 +3132,7 @@ u8 sub_80DC028(s16 a, s16 b, u8 c) else gTasks[taskId].data[2] = -1; gTasks[taskId].data[3] = c; - return taskId; + return taskId; } void sub_80DC0F4(u8 taskId) @@ -3474,24 +3500,25 @@ extern const struct CompressedSpriteSheet gUnknown_08589904[]; extern const struct SpritePalette gUnknown_08589924[]; extern const struct SpriteTemplate gSpriteTemplate_858998C[]; +#ifdef NONMATCHING u8 sub_80DC9EC(u8 a) { - u8 r5 = gUnknown_02039F26[a] * 40 + 32; + u8 r5 = gUnknown_02039F26[a] * 40 + 32; u8 r8; u8 r6; volatile u8 zero; - + LoadCompressedObjectPic(&gUnknown_08589904[a]); LoadSpritePalette(&gUnknown_08589924[a]); r6 = CreateSprite(&gSpriteTemplate_858998C[a], 184, r5, 29); - gSprites[r8].oam.tileNum += 64; + gSprites[r8].oam.tileNum += 64; r8 = CreateSprite(&gSpriteTemplate_858998C[a], 248, r5, 29); CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x26), (u8 *)(VRAM + 0x10000 + gSprites[r6].oam.tileNum * 32)); CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), (u8 *)(VRAM + 0x10000 + gSprites[r8].oam.tileNum * 32)); - CpuSet(&r8, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), 0x050000c0); + CpuSet(&r8, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), 0x050000c0); RequestDma3Copy((void *)(VRAM + 0x10000 + (0x28 + gSprites[r6].oam.tileNum) * 32), (u8 *)(VRAM + 0x10000 + gSprites[r8].oam.tileNum * 32), 0x80, 1); @@ -3506,4 +3533,2661 @@ u8 sub_80DC9EC(u8 a) gSprites[r8].data[0] = r6; return r6; -} \ No newline at end of file +} +#else +NAKED +u8 sub_80DC9EC(u8 a) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x10\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0xC]\n\ + ldr r6, =gUnknown_02039F26\n\ + adds r6, r0, r6\n\ + ldrb r0, [r6]\n\ + lsls r5, r0, 2\n\ + adds r5, r0\n\ + lsls r5, 27\n\ + movs r0, 0x80\n\ + lsls r0, 22\n\ + adds r5, r0\n\ + lsrs r5, 24\n\ + ldr r1, [sp, 0xC]\n\ + lsls r4, r1, 3\n\ + ldr r0, =gUnknown_08589904\n\ + adds r0, r4, r0\n\ + bl LoadCompressedObjectPic\n\ + ldr r0, =gUnknown_08589924\n\ + adds r4, r0\n\ + adds r0, r4, 0\n\ + bl LoadSpritePalette\n\ + ldr r2, [sp, 0xC]\n\ + lsls r4, r2, 1\n\ + adds r4, r2\n\ + lsls r4, 3\n\ + ldr r0, =gSpriteTemplate_858998C\n\ + adds r4, r0\n\ + adds r0, r4, 0\n\ + movs r1, 0xB8\n\ + adds r2, r5, 0\n\ + movs r3, 0x1D\n\ + bl CreateSprite\n\ + mov r9, r0\n\ + mov r3, r9\n\ + lsls r3, 24\n\ + lsrs r3, 24\n\ + mov r9, r3\n\ + adds r0, r4, 0\n\ + movs r1, 0xF8\n\ + adds r2, r5, 0\n\ + movs r3, 0x1D\n\ + bl CreateSprite\n\ + mov r8, r0\n\ + mov r0, r8\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + lsls r5, r0, 4\n\ + add r5, r8\n\ + lsls r5, 2\n\ + ldr r1, =gSprites\n\ + adds r5, r1\n\ + ldrh r2, [r5, 0x4]\n\ + lsls r1, r2, 22\n\ + lsrs r1, 22\n\ + adds r1, 0x40\n\ + ldr r3, =0x000003ff\n\ + adds r0, r3, 0\n\ + ands r1, r0\n\ + ldr r0, =0xfffffc00\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strh r0, [r5, 0x4]\n\ + movs r4, 0xC0\n\ + lsls r4, 19\n\ + ldrb r0, [r6]\n\ + lsls r3, r0, 2\n\ + adds r3, r0\n\ + lsls r3, 6\n\ + ldr r0, =0x0600e026\n\ + adds r3, r0\n\ + ldr r7, =gContestResources\n\ + ldr r0, [r7]\n\ + ldr r0, [r0, 0x34]\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + movs r1, 0x3\n\ + adds r2, r4, 0\n\ + bl CopySpriteTiles\n\ + ldrb r0, [r6]\n\ + lsls r3, r0, 2\n\ + adds r3, r0\n\ + lsls r3, 6\n\ + ldr r1, =0x0600e036\n\ + adds r3, r1\n\ + ldr r0, [r7]\n\ + ldr r0, [r0, 0x38]\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + movs r1, 0x3\n\ + adds r2, r4, 0\n\ + bl CopySpriteTiles\n\ + movs r4, 0\n\ + str r4, [sp, 0x4]\n\ + ldr r0, [r7]\n\ + ldr r1, [r0, 0x34]\n\ + movs r6, 0xA0\n\ + lsls r6, 3\n\ + adds r1, r6\n\ + ldr r2, =0x050000c0\n\ + mov r10, r2\n\ + add r0, sp, 0x4\n\ + bl CpuSet\n\ + str r4, [sp, 0x8]\n\ + add r0, sp, 0x8\n\ + ldr r1, [r7]\n\ + ldr r1, [r1, 0x38]\n\ + adds r1, r6\n\ + mov r2, r10\n\ + bl CpuSet\n\ + ldr r0, [r7]\n\ + ldr r0, [r0, 0x34]\n\ + mov r3, r9\n\ + lsls r4, r3, 4\n\ + add r4, r9\n\ + lsls r4, 2\n\ + ldr r1, =gSprites\n\ + adds r4, r1\n\ + ldrh r1, [r4, 0x4]\n\ + lsls r1, 22\n\ + lsrs r1, 17\n\ + ldr r6, =0x06010000\n\ + adds r1, r6\n\ + movs r2, 0x80\n\ + lsls r2, 4\n\ + mov r10, r2\n\ + movs r3, 0x1\n\ + bl RequestDma3Copy\n\ + ldr r0, [r7]\n\ + ldr r0, [r0, 0x38]\n\ + ldrh r1, [r5, 0x4]\n\ + lsls r1, 22\n\ + lsrs r1, 17\n\ + adds r1, r6\n\ + mov r2, r10\n\ + movs r3, 0x1\n\ + bl RequestDma3Copy\n\ + mov r3, r8\n\ + strh r3, [r4, 0x2E]\n\ + mov r0, r9\n\ + strh r0, [r5, 0x2E]\n\ + mov r1, sp\n\ + ldrh r1, [r1, 0xC]\n\ + strh r1, [r4, 0x30]\n\ + mov r2, sp\n\ + ldrh r2, [r2, 0xC]\n\ + strh r2, [r5, 0x30]\n\ + mov r0, r9\n\ + add sp, 0x10\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .pool\n\ + .syntax divided\n"); +} +#endif + +void sub_80DCB78(u8 spriteId) +{ + u8 spriteId2 = gSprites[spriteId].data[0]; + + FreeSpriteOamMatrix(&gSprites[spriteId2]); + DestroySprite(&gSprites[spriteId2]); + DestroySpriteAndFreeResources(&gSprites[spriteId]); +} + +void sub_80DCBB4(void) +{ + SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); + SetGpuReg(REG_OFFSET_BLDALPHA, 0x0907); +} + +void sub_80DCBD0(void) +{ + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); +} + +void sub_80DCBE8(u8 a, bool8 b) +{ + u8 r5; + + sub_80DCBB4(); + gContestResources->field_14[gSprites[a].data[1]].unk2_1 = 1; + r5 = gSprites[a].data[0]; + StartSpriteAffineAnim(&gSprites[a], 1); + StartSpriteAffineAnim(&gSprites[r5], 1); + gSprites[a].callback = sub_80DCC84; + gSprites[r5].callback = SpriteCallbackDummy; + if (b == FALSE) + PlaySE(SE_C_PIKON); + else + PlaySE(SE_PC_LOGIN); +} + +void sub_80DCC84(struct Sprite *sprite) +{ + if (sprite->affineAnimEnded) + { + u8 r1 = sprite->data[0]; + + if (gSprites[r1].affineAnimEnded) + { + sprite->invisible = TRUE; + gSprites[r1].invisible = TRUE; + sprite->callback = sub_80DCCD8; + } + } +} + +void sub_80DCCD8(struct Sprite *sprite) +{ + gContestResources->field_14[sprite->data[1]].unk2_1 = 0; + sub_80DCB78(sprite->data[0]); + sub_80DCBD0(); +} + +void sub_80DCD08(void) +{ + if(gHeap[0x1A000] == 1) + gHeap[0x1A000] = 0; + else + gHeap[0x1A000] = 1; + + if(gHeap[0x1A000] == 0) + { + sub_80DAEA4(); + sub_80DB2BC(); + } + else + sub_80DCD48(); +} + +#ifdef NONMATCHING +void sub_80DCD48(void) +{ + u8 r5 = 0; + u8 sp8[8]; + + if (gUnknown_020322D5 != 0) + { + u8 i; + s16 r2; + + + for (i = 0; i < 4; i++) + { + r2 = sContestantStatus[i].unk4; + if (r2 < 0) + { + r2 = -r2; + sp8[0] = CHAR_HYPHEN; + r5++; + } + ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4); + Text_InitWindowAndPrintText( + &gUnknown_03004210, + sp8, + 592 + gUnknown_02039F26[i] * 22, + gUnknown_083CA310[gUnknown_02039F26[i]][0], + gUnknown_083CA310[gUnknown_02039F26[i]][1]); + r5 = 0; + } + for (i = 0; i < 4; i++) + { + r2 = sContestantStatus[i].appeal2; + if (r2 < 0) + { + r2 = -r2; + sp8[0] = CHAR_HYPHEN; + r5++; + } + ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4); + Text_InitWindowAndPrintText( + &gUnknown_03004210, + sp8, + 512 + gUnknown_02039F26[i] * 20, + gUnknown_083CA308[gUnknown_02039F26[i]][0], + gUnknown_083CA308[gUnknown_02039F26[i]][1]); + r5 = 0; + } + sub_80AEB30(); + } +} +#else +NAKED +void sub_80DCD48(void) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + sub sp, 0xC\n\ + ldr r0, =gUnknown_020322D5\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080DCE44\n\ + ldr r0, =gHeap\n\ + movs r1, 0xD0\n\ + lsls r1, 9\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080DCE44\n\ + cmp r0, 0\n\ + blt _080DCD7C\n\ + cmp r0, 0x3\n\ + bgt _080DCD7C\n\ + cmp r0, 0x2\n\ + blt _080DCD7C\n\ + bl sub_80DF750\n\ + b _080DCE44\n\ + .pool\n\ +_080DCD7C:\n\ + movs r5, 0\n\ +_080DCD7E:\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + bl FillWindowPixelBuffer\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + cmp r5, 0x3\n\ + bls _080DCD7E\n\ + movs r5, 0\n\ +_080DCD92:\n\ + ldr r0, =gContestResources\n\ + ldr r0, [r0]\n\ + ldr r1, [r0, 0x4]\n\ + lsls r0, r5, 3\n\ + subs r0, r5\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + add r2, sp, 0x4\n\ + ldrh r4, [r0, 0x4]\n\ + movs r1, 0x4\n\ + ldrsh r0, [r0, r1]\n\ + cmp r0, 0\n\ + bge _080DCDBC\n\ + negs r0, r0\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + adds r0, r2, 0\n\ + ldr r1, =gText_OneDash\n\ + bl StringCopy\n\ + adds r2, r0, 0\n\ +_080DCDBC:\n\ + lsls r1, r4, 16\n\ + asrs r1, 16\n\ + adds r0, r2, 0\n\ + movs r2, 0\n\ + movs r3, 0x4\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r0, =gUnknown_02039F26\n\ + adds r0, r5, r0\n\ + ldrb r0, [r0]\n\ + movs r1, 0x7\n\ + str r1, [sp]\n\ + add r1, sp, 0x4\n\ + movs r2, 0x37\n\ + movs r3, 0x1\n\ + bl Contest_PrintTextToBg0WindowAt\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + cmp r5, 0x3\n\ + bls _080DCD92\n\ + movs r5, 0\n\ +_080DCDEA:\n\ + ldr r0, =gContestResources\n\ + ldr r0, [r0]\n\ + ldr r1, [r0, 0x4]\n\ + lsls r0, r5, 3\n\ + subs r0, r5\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + add r2, sp, 0x4\n\ + ldrh r4, [r0, 0x2]\n\ + movs r1, 0x2\n\ + ldrsh r0, [r0, r1]\n\ + cmp r0, 0\n\ + bge _080DCE14\n\ + negs r0, r0\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + adds r0, r2, 0\n\ + ldr r1, =gText_OneDash\n\ + bl StringCopy\n\ + adds r2, r0, 0\n\ +_080DCE14:\n\ + lsls r1, r4, 16\n\ + asrs r1, 16\n\ + adds r0, r2, 0\n\ + movs r2, 0\n\ + movs r3, 0x4\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r0, =gUnknown_02039F26\n\ + adds r0, r5, r0\n\ + ldrb r0, [r0]\n\ + movs r1, 0x7\n\ + str r1, [sp]\n\ + add r1, sp, 0x4\n\ + movs r2, 0x5\n\ + movs r3, 0x1\n\ + bl Contest_PrintTextToBg0WindowAt\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + cmp r5, 0x3\n\ + bls _080DCDEA\n\ + bl sub_80DB2BC\n\ +_080DCE44:\n\ + add sp, 0xC\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided\n"); +} +#endif + +void sub_80DCE58(u8 a) +{ + u8 sp0[4]; + u16 sp4[4] = {0}; + s32 i; + s32 r2; + s32 r4; + + for (i = 0; i < 4; i++) + { + sp4[i] = Random(); + for (r2 = 0; r2 < i; r2++) + { + if (sp4[i] == sp4[r2]) + { + i--; + break; + } + } + } + + if (a == 0) + { + for (i = 0; i < 4; i++) + { + gUnknown_02039F26[i] = i; + for (r4 = 0; r4 < i; r4++) + { + if (gContestMonConditions[gUnknown_02039F26[r4]] < gContestMonConditions[i] + || (gContestMonConditions[gUnknown_02039F26[r4]] == gContestMonConditions[i] && sp4[gUnknown_02039F26[r4]] < sp4[i])) + { + for (r2 = i; r2 > r4; r2--) + gUnknown_02039F26[r2] = gUnknown_02039F26[r2 - 1]; + gUnknown_02039F26[r4] = i; + break; + } + } + if (r4 == i) + gUnknown_02039F26[i] = i; + } + memcpy(sp0, gUnknown_02039F26, sizeof(sp0)); + for (i = 0; i < 4; i++) + gUnknown_02039F26[sp0[i]] = i; + } + else + { + memset(sp0, 0xFF, sizeof(sp0)); + for (i = 0; i < 4; i++) + { + u8 r2 = sContestantStatus[i].unkB_0; + + while (1) + { + u8 *ptr = &sp0[r2]; + if (*ptr == 0xFF) + { + *ptr = i; + gUnknown_02039F26[i] = r2; + break; + } + r2++; + } + } + for (i = 0; i < 3; i++) + { + for (r4 = 3; r4 > i; r4--) + { + if (sContestantStatus[r4 - 1].unkB_0 == sContestantStatus[r4].unkB_0 + && gUnknown_02039F26[r4 - 1] < gUnknown_02039F26[r4] + && sp4[r4 - 1] < sp4[r4]) + { + u8 temp = gUnknown_02039F26[r4]; + + gUnknown_02039F26[r4] = gUnknown_02039F26[r4 - 1]; + gUnknown_02039F26[r4 - 1] = temp; + } + } + } + } +} + +void sub_80DD04C(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + LoadPalette(&gHeap[0x1A004] + (i + 5) * 32, (gUnknown_02039F26[i] + 5) * 16, 32); + } + sub_80DAEA4(); +} + +#ifdef NONMATCHING +void sub_80DD080(u8 contestant) +{ + bool8 r8; + s32 i; + + sContestantStatus[contestant].appeal2 = 0; + sContestantStatus[contestant].appeal1 = 0; + r8 = sub_80DBA68(contestant); + if (r8) + { + u16 move = sContestantStatus[contestant].currMove; + u8 effect = gContestMoves[move].effect; + u8 rnd; + + sContestantStatus[contestant].moveCategory = gContestMoves[sContestantStatus[contestant].currMove].contestCategory; + if (sContestantStatus[contestant].currMove == sContestantStatus[contestant].prevMove && sContestantStatus[contestant].currMove != MOVE_NONE) + { + sContestantStatus[contestant].disappointedRepeat = TRUE; + sContestantStatus[contestant].moveRepeatCount++; + } + else + { + sContestantStatus[contestant].moveRepeatCount = 0; + } + sContestantStatus[contestant].appeal1 = gContestEffects[effect].appeal; + sContestantStatus[contestant].appeal2 = gContestEffects[effect].appeal; + shared192D0.jam = gContestEffects[effect].jam; + shared192D0.jam2 = shared192D0.jam; + shared192D0.jam2 = gContestEffects[effect].jam; + + shared192D0.contestant = contestant; + for (i = 0; i < 4; i++) + { + sContestantStatus[i].jam = 0; + shared192D0.unnervedPokes[i] = 0; + } + if (sContestantStatus[contestant].hasJudgesAttention && AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove) == 0) + sContestantStatus[contestant].hasJudgesAttention = 0; + sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition; + gContestEffectFuncs[effect](); + if (sContestantStatus[contestant].conditionMod == 1) + sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition - 10; + else if (sContestantStatus[contestant].appealTripleCondition) + sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition * 3; + + + sContestantStatus[contestant].unk16 = 0; + sContestantStatus[contestant].unk15_6 = 0; + if (sub_80DE1E8(contestant)) + { + u8 r2 = AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove); + + if (r2 != 0 && sContestantStatus[contestant].hasJudgesAttention) + { + sContestantStatus[contestant].unk16 = r2; + sContestantStatus[contestant].unk15_6 = 1; + sContestantStatus[contestant].hasJudgesAttention = 0; + sContestantStatus[contestant].unk17 = sContestantStatus[contestant].appeal1 * sContestantStatus[contestant].unk16; + sContestantStatus[contestant].unk15_3 = 1; + } + else + { + if (gContestMoves[sContestantStatus[contestant].currMove].comboStarterId != 0) + { + sContestantStatus[contestant].hasJudgesAttention = 1; + sContestantStatus[contestant].unk15_6 = 1; + } + else + { + sContestantStatus[contestant].hasJudgesAttention = 0; + } + } + } + if (sContestantStatus[contestant].disappointedRepeat) + sContestantStatus[contestant].unk18 = (sContestantStatus[contestant].moveRepeatCount + 1) * 10; + if (sContestantStatus[contestant].nervous) + { + sContestantStatus[contestant].hasJudgesAttention = 0; + sContestantStatus[contestant].appeal2 = 0; + sContestantStatus[contestant].appeal1 = 0; + } + shared19328.bits_0 = Contest_GetMoveExcitement(sContestantStatus[contestant].currMove); + if (sContestantStatus[contestant].overrideCategoryExcitementMod) + shared19328.bits_0 = 1; + if (shared19328.bits_0 > 0) + { + if (sContest.applauseLevel + shared19328.bits_0 > 4) + shared19328.unk2 = 60; + else + shared19328.unk2 = 10; + } + else + { + shared19328.unk2 = 0; + } + + rnd = Random() % 3; + for (i = 0; i < 4; i++) + { + if (i != contestant) + { + if (rnd == 0) + break; + rnd--; + } + } + sContestantStatus[contestant].unk1B = i; + } +} + +#else +NAKED +void sub_80DD080(u8 contestant) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + ldr r4, =gContestResources\n\ + ldr r3, [r4]\n\ + ldr r1, [r3, 0x4]\n\ + lsls r7, r6, 3\n\ + subs r0, r7, r6\n\ + lsls r5, r0, 2\n\ + adds r1, r5, r1\n\ + movs r2, 0\n\ + strh r2, [r1, 0x2]\n\ + ldr r0, [r3, 0x4]\n\ + adds r0, r5, r0\n\ + strh r2, [r0]\n\ + adds r0, r6, 0\n\ + bl sub_80DBA68\n\ + lsls r0, 24\n\ + mov r8, r4\n\ + cmp r0, 0\n\ + bne _080DD0B4\n\ + b _080DD3C4\n\ +_080DD0B4:\n\ + ldr r0, [r4]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r5, r1\n\ + ldrh r0, [r1, 0x6]\n\ + ldr r2, =gContestMoves\n\ + lsls r0, 3\n\ + adds r0, r2\n\ + ldrb r2, [r0]\n\ + mov r9, r2\n\ + ldrb r0, [r0, 0x1]\n\ + lsls r0, 29\n\ + lsrs r0, 29\n\ + strb r0, [r1, 0xA]\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x4]\n\ + adds r2, r5, r0\n\ + ldrh r0, [r2, 0x6]\n\ + ldrh r1, [r2, 0x8]\n\ + cmp r0, r1\n\ + bne _080DD110\n\ + cmp r0, 0\n\ + beq _080DD110\n\ + ldrb r0, [r2, 0x15]\n\ + movs r1, 0x1\n\ + orrs r0, r1\n\ + strb r0, [r2, 0x15]\n\ + ldr r0, [r4]\n\ + ldr r2, [r0, 0x4]\n\ + adds r2, r5, r2\n\ + ldrb r3, [r2, 0xB]\n\ + lsls r1, r3, 25\n\ + lsrs r1, 29\n\ + adds r1, 0x1\n\ + movs r0, 0x7\n\ + ands r1, r0\n\ + lsls r1, 4\n\ + movs r0, 0x71\n\ + negs r0, r0\n\ + ands r0, r3\n\ + orrs r0, r1\n\ + strb r0, [r2, 0xB]\n\ + b _080DD12C\n\ + .pool\n\ +_080DD110:\n\ + ldr r4, =gContestResources\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x4]\n\ + lsls r3, r6, 3\n\ + subs r1, r3, r6\n\ + lsls r1, 2\n\ + adds r1, r0\n\ + ldrb r2, [r1, 0xB]\n\ + movs r0, 0x71\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r1, 0xB]\n\ + mov r8, r4\n\ + adds r7, r3, 0\n\ +_080DD12C:\n\ + mov r2, r8\n\ + ldr r4, [r2]\n\ + ldr r2, [r4, 0x4]\n\ + subs r0, r7, r6\n\ + lsls r0, 2\n\ + adds r2, r0, r2\n\ + ldr r3, =gContestEffects\n\ + mov r1, r9\n\ + lsls r5, r1, 2\n\ + adds r3, r5, r3\n\ + ldrb r1, [r3, 0x1]\n\ + strh r1, [r2]\n\ + ldr r1, [r4, 0x4]\n\ + adds r0, r1\n\ + ldrh r1, [r0]\n\ + strh r1, [r0, 0x2]\n\ + ldr r1, [r4, 0x8]\n\ + ldrb r0, [r3, 0x2]\n\ + strh r0, [r1, 0x4]\n\ + ldr r1, [r4, 0x8]\n\ + ldrh r0, [r1, 0x4]\n\ + strh r0, [r1, 0x6]\n\ + ldr r0, [r4, 0x8]\n\ + strb r6, [r0, 0x11]\n\ + movs r2, 0\n\ + mov r9, r5\n\ + mov r4, r8\n\ + movs r3, 0\n\ + movs r1, 0\n\ +_080DD166:\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x4]\n\ + adds r0, r1, r0\n\ + strb r3, [r0, 0xE]\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x8]\n\ + adds r0, 0xD\n\ + adds r0, r2\n\ + strb r3, [r0]\n\ + adds r1, 0x1C\n\ + adds r2, 0x1\n\ + cmp r2, 0x3\n\ + ble _080DD166\n\ + ldr r5, =gContestResources\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + subs r0, r7, r6\n\ + lsls r4, r0, 2\n\ + adds r2, r4, r1\n\ + ldrb r1, [r2, 0x15]\n\ + movs r0, 0x10\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DD1B4\n\ + ldrh r0, [r2, 0x8]\n\ + ldrh r1, [r2, 0x6]\n\ + bl AreMovesContestCombo\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080DD1B4\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r4, r1\n\ + ldrb r2, [r1, 0x15]\n\ + movs r0, 0x11\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r1, 0x15]\n\ +_080DD1B4:\n\ + ldr r0, =gContestEffectFuncs\n\ + add r0, r9\n\ + ldr r0, [r0]\n\ + bl _call_via_r0\n\ + ldr r0, =gContestResources\n\ + ldr r0, [r0]\n\ + ldr r1, [r0, 0x4]\n\ + subs r0, r7, r6\n\ + lsls r0, 2\n\ + adds r2, r0, r1\n\ + ldrb r1, [r2, 0x10]\n\ + movs r0, 0x30\n\ + ands r0, r1\n\ + cmp r0, 0x10\n\ + bne _080DD1EC\n\ + ldrh r1, [r2, 0x2]\n\ + subs r1, 0xA\n\ + movs r0, 0xD\n\ + ldrsb r0, [r2, r0]\n\ + b _080DD206\n\ + .pool\n\ +_080DD1EC:\n\ + ldrb r1, [r2, 0x11]\n\ + movs r0, 0x20\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DD200\n\ + movs r1, 0xD\n\ + ldrsb r1, [r2, r1]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + b _080DD204\n\ +_080DD200:\n\ + movs r0, 0xD\n\ + ldrsb r0, [r2, r0]\n\ +_080DD204:\n\ + ldrh r1, [r2, 0x2]\n\ +_080DD206:\n\ + adds r0, r1\n\ + strh r0, [r2, 0x2]\n\ + ldr r5, =gContestResources\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + subs r0, r7, r6\n\ + lsls r4, r0, 2\n\ + adds r1, r4, r1\n\ + movs r0, 0\n\ + strb r0, [r1, 0x16]\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r4, r1\n\ + ldrb r2, [r1, 0x15]\n\ + movs r0, 0x41\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r1, 0x15]\n\ + adds r0, r6, 0\n\ + bl sub_80DE1E8\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080DD2E2\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r4, r1\n\ + ldrh r0, [r1, 0x8]\n\ + ldrh r1, [r1, 0x6]\n\ + bl AreMovesContestCombo\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + cmp r3, 0\n\ + beq _080DD29C\n\ + ldr r0, [r5]\n\ + ldr r0, [r0, 0x4]\n\ + adds r2, r4, r0\n\ + ldrb r1, [r2, 0x15]\n\ + movs r0, 0x10\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DD29C\n\ + strb r3, [r2, 0x16]\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r4, r1\n\ + ldrb r0, [r1, 0x15]\n\ + movs r2, 0x40\n\ + orrs r0, r2\n\ + strb r0, [r1, 0x15]\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r4, r1\n\ + ldrb r2, [r1, 0x15]\n\ + movs r0, 0x11\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r1, 0x15]\n\ + ldr r0, [r5]\n\ + ldr r0, [r0, 0x4]\n\ + adds r0, r4, r0\n\ + movs r1, 0\n\ + ldrsh r2, [r0, r1]\n\ + ldrb r1, [r0, 0x16]\n\ + muls r1, r2\n\ + strb r1, [r0, 0x17]\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r4, r1\n\ + ldrb r0, [r1, 0x15]\n\ + movs r2, 0x8\n\ + b _080DD2C8\n\ + .pool\n\ +_080DD29C:\n\ + ldr r2, =gContestMoves\n\ + ldr r5, =gContestResources\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + subs r0, r7, r6\n\ + lsls r4, r0, 2\n\ + adds r3, r4, r1\n\ + ldrh r0, [r3, 0x6]\n\ + lsls r0, 3\n\ + adds r0, r2\n\ + ldrb r0, [r0, 0x2]\n\ + cmp r0, 0\n\ + beq _080DD2D8\n\ + ldrb r0, [r3, 0x15]\n\ + movs r1, 0x10\n\ + orrs r0, r1\n\ + strb r0, [r3, 0x15]\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + adds r1, r4, r1\n\ + ldrb r0, [r1, 0x15]\n\ + movs r2, 0x40\n\ +_080DD2C8:\n\ + orrs r0, r2\n\ + strb r0, [r1, 0x15]\n\ + b _080DD2E2\n\ + .pool\n\ +_080DD2D8:\n\ + ldrb r1, [r3, 0x15]\n\ + movs r0, 0x11\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r3, 0x15]\n\ +_080DD2E2:\n\ + ldr r5, =gContestResources\n\ + ldr r0, [r5]\n\ + ldr r1, [r0, 0x4]\n\ + subs r0, r7, r6\n\ + lsls r4, r0, 2\n\ + adds r2, r4, r1\n\ + ldrb r1, [r2, 0x15]\n\ + movs r0, 0x1\n\ + mov r8, r0\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DD30A\n\ + ldrb r0, [r2, 0xB]\n\ + lsls r0, 25\n\ + lsrs r0, 29\n\ + adds r0, 0x1\n\ + lsls r1, r0, 2\n\ + adds r1, r0\n\ + lsls r1, 1\n\ + strb r1, [r2, 0x18]\n\ +_080DD30A:\n\ + ldr r0, [r5]\n\ + ldr r0, [r0, 0x4]\n\ + adds r2, r4, r0\n\ + ldrb r1, [r2, 0xC]\n\ + mov r0, r8\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DD334\n\ + ldrb r1, [r2, 0x15]\n\ + movs r0, 0x11\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r2, 0x15]\n\ + ldr r2, [r5]\n\ + ldr r0, [r2, 0x4]\n\ + adds r0, r4, r0\n\ + movs r1, 0\n\ + strh r1, [r0, 0x2]\n\ + ldr r0, [r2, 0x4]\n\ + adds r0, r4, r0\n\ + strh r1, [r0]\n\ +_080DD334:\n\ + ldr r0, [r5]\n\ + ldr r0, [r0, 0x4]\n\ + adds r0, r4, r0\n\ + ldrh r0, [r0, 0x6]\n\ + bl Contest_GetMoveExcitement\n\ + ldr r1, [r5]\n\ + ldr r1, [r1, 0x10]\n\ + strb r0, [r1]\n\ + ldr r2, [r5]\n\ + ldr r0, [r2, 0x4]\n\ + adds r0, r4, r0\n\ + ldrb r1, [r0, 0x11]\n\ + movs r0, 0x10\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DD35C\n\ + ldr r0, [r2, 0x10]\n\ + mov r1, r8\n\ + strb r1, [r0]\n\ +_080DD35C:\n\ + ldr r1, [r5]\n\ + ldr r3, [r1, 0x10]\n\ + movs r0, 0\n\ + ldrsb r0, [r3, r0]\n\ + cmp r0, 0\n\ + ble _080DD388\n\ + ldr r0, [r1]\n\ + ldrb r0, [r0, 0x13]\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + movs r1, 0\n\ + ldrsb r1, [r3, r1]\n\ + adds r0, r1\n\ + cmp r0, 0x4\n\ + ble _080DD384\n\ + movs r0, 0x3C\n\ + b _080DD38A\n\ + .pool\n\ +_080DD384:\n\ + movs r0, 0xA\n\ + b _080DD38A\n\ +_080DD388:\n\ + movs r0, 0\n\ +_080DD38A:\n\ + strb r0, [r3, 0x2]\n\ + bl Random\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + movs r1, 0x3\n\ + bl __umodsi3\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + movs r2, 0\n\ + b _080DD3AE\n\ +_080DD3A2:\n\ + subs r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ +_080DD3A8:\n\ + adds r2, 0x1\n\ + cmp r2, 0x3\n\ + bgt _080DD3B6\n\ +_080DD3AE:\n\ + cmp r2, r6\n\ + beq _080DD3A8\n\ + cmp r0, 0\n\ + bne _080DD3A2\n\ +_080DD3B6:\n\ + ldr r0, =gContestResources\n\ + ldr r0, [r0]\n\ + ldr r1, [r0, 0x4]\n\ + subs r0, r7, r6\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + strb r2, [r0, 0x1B]\n\ +_080DD3C4:\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided\n"); +} +#endif + +void SetContestantEffectStringID(u8 a, u8 b) +{ + sContestantStatus[a].effectStringId = b; +} + +void SetContestantEffectStringID2(u8 a, u8 b) +{ + sContestantStatus[a].effectStringId2 = b; +} + +void SetStartledString(u8 contestant, u8 jam) +{ + if (jam >= 60) + SetContestantEffectStringID(contestant, CONTEST_STRING_TRIPPED_OVER); + else if (jam >= 40) + SetContestantEffectStringID(contestant, CONTEST_STRING_LEAPT_UP); + else if (jam >= 30) + SetContestantEffectStringID(contestant, CONTEST_STRING_UTTER_CRY); + else if (jam >= 20) + SetContestantEffectStringID(contestant, CONTEST_STRING_TURNED_BACK); + else if (jam >= 10) + SetContestantEffectStringID(contestant, CONTEST_STRING_LOOKED_DOWN); +} + +void sub_80DD45C(u8 contestant, u8 stringId) +{ + StringCopy(gStringVar1, gContestMons[contestant].nickname); + StringCopy(gStringVar2, gMoveNames[sContestantStatus[contestant].currMove]); + if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_COOL) + StringCopy(gStringVar3, gText_Contest_Shyness); + else if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) + StringCopy(gStringVar3, gText_Contest_Anxiety); + else if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_CUTE) + StringCopy(gStringVar3, gText_Contest_Laziness); + else if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory == CONTEST_CATEGORY_SMART) + StringCopy(gStringVar3, gText_Contest_Hesitancy); + else + StringCopy(gStringVar3, gText_Contest_Fear); + StringExpandPlaceholders(gStringVar4, gUnknown_08587E10[stringId]); + sub_80DB89C(); + Contest_StartTextPrinter(gStringVar4, 1); +} + +void MakeContestantNervous(u8 p) +{ + sContestantStatus[p].nervous = 1; + sContestantStatus[p].currMove = MOVE_NONE; +} + +void sub_80DD590(void) +{ + u8 r12 = 0; + s32 i; + s32 j; + u8 sp0[4]; + u8 sp4[4]; + + for (i = 0; i < 4; i++) + { + sp0[i] = gUnknown_02039F26[i]; + sp4[i] = 0; + } + + for (i = 0; i < 4; i++) + { + for (j = 0; j < 4; j++) + { + if (sContestantStatus[j].nextTurnOrder == i) + { + sp0[j] = i; + sp4[j] = 1; + break; + } + } + if (j == 4) + { + for (j = 0; j < 4; j++) + { + if (sp4[j] == 0 && sContestantStatus[j].nextTurnOrder == 0xFF) + { + r12 = j; + j++; + break; + } + } + for (; j < 4; j++) + { + if (sp4[j] == 0 && sContestantStatus[j].nextTurnOrder == 0xFF + && gUnknown_02039F26[r12] > gUnknown_02039F26[j]) + r12 = j; + } + sp0[r12] = i; + sp4[r12] = 1; + } + } + + for (i = 0; i < 4; i++) + { + shared192D0.turnOrder[i] = sp0[i]; + sContestantStatus[i].nextTurnOrder = 0xFF; + sContestantStatus[i].turnOrderMod = 0; + gUnknown_02039F26[i] = sp0[i]; + } +} + +void sub_80DD6DC(struct Sprite *sprite) +{ + if (sprite->data[1]++ > 84) + { + sprite->data[1] = 0; + sprite->invisible = TRUE; + sprite->callback = SpriteCallbackDummy; + sContest.unk1920A_4 = 0; + } +} + +void sub_80DD720(u8 a) +{ + u8 spriteId = sContest.unk19216; + + switch (a) + { + case 0: + case 1: + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0]; + PlaySE(SE_HAZURE); + break; + case 2: + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 4; + PlaySE(SE_SEIKAI); + break; + case 3: + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 8; + PlaySE(SE_SEIKAI); + break; + case 4: + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; + PlaySE(SE_TK_WARPIN); + break; + case 5: // exactly the same as case 4 + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; + PlaySE(SE_TK_WARPIN); + break; + case 6: + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 16; + PlaySE(SE_TK_WARPIN); + break; + case 8: + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 24; + PlaySE(SE_W215); + break; + case 7: + default: + gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 20; + PlaySE(SE_TK_WARPIN); + break; + } + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].invisible = FALSE; + gSprites[spriteId].callback = sub_80DD6DC; + sContest.unk1920A_4 = 1; +} + +void sub_80DD940(void) +{ + s32 i; + + for (i = 0; i < 5; i++) + { + const u8 *src; + + if (i < sContest.applauseLevel) + src = gContestApplauseMeterGfx + 64; + else + src = gContestApplauseMeterGfx; + CpuSet(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 0x04000008); + CpuSet(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 0x04000008); + + if (sContest.applauseLevel > 4) + sub_80DDA20(); + } +} + +s8 Contest_GetMoveExcitement(u16 move) +{ + return gContestExcitementTable[gSpecialVar_ContestCategory][gContestMoves[move].contestCategory]; +} + +u8 sub_80DDA20(void) +{ + u8 taskId = CreateTask(c3_08130B10, 10); + + gTasks[taskId].data[1] = 1; + gTasks[taskId].data[2] = IndexOfSpritePaletteTag(0x0ABE2); + return taskId; +} + +void c3_08130B10(u8 taskId) +{ + if (++gTasks[taskId].data[0] == 1) + { + gTasks[taskId].data[0] = 0; + if (gTasks[taskId].data[3] == 0) + gTasks[taskId].data[4]++; + else + gTasks[taskId].data[4]--; + BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], RGB(31, 31, 31)); + if (gTasks[taskId].data[4] == 0 || gTasks[taskId].data[4] == 16) + { + gTasks[taskId].data[3] ^= 1; + if (sContest.applauseLevel < 5) + { + BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, RGB(31, 0, 0)); + DestroyTask(taskId); + } + } + } +} + +void sub_80DDB0C(void) +{ + CreateTask(sub_80DDB6C, 10); + gSprites[sContest.applauseMeterSpriteId].pos2.x = -70; + gSprites[sContest.applauseMeterSpriteId].invisible = FALSE; + sContest.unk1920A_6 = 1; +} + +void sub_80DDB6C(u8 taskId) +{ + struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId]; + + gTasks[taskId].data[10] += 1664; + sprite->pos2.x += gTasks[taskId].data[10] >> 8; + gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF; + if (sprite->pos2.x > 0) + sprite->pos2.x = 0; + if (sprite->pos2.x == 0) + { + sContest.unk1920A_6 = 0; + DestroyTask(taskId); + } +} + +void sub_80DDBE8(void) +{ + if (gSprites[sContest.applauseMeterSpriteId].invisible == TRUE) + { + sContest.unk1920A_6 = 0; + } + else + { + CreateTask(task08_080CD1CC, 10); + gSprites[sContest.applauseMeterSpriteId].pos2.x = 0; + sContest.unk1920A_6 = 1; + } +} + +void task08_080CD1CC(u8 taskId) +{ + struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId]; + + gTasks[taskId].data[10] += 1664; + sprite->pos2.x -= gTasks[taskId].data[10] >> 8; + gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF; + if (sprite->pos2.x < -70) + sprite->pos2.x = -70; + if (sprite->pos2.x == -70) + { + sprite->invisible = TRUE; + sContest.unk1920A_6 = 0; + DestroyTask(taskId); + } +} + +void sub_80DDCDC(s8 a) +{ + u8 taskId = CreateTask(sub_80DDD20, 5); + + gTasks[taskId].data[0] = a; + sContest.unk1920A_5 = 1; +} + +void sub_80DDD20(u8 taskId) +{ + switch (gTasks[taskId].data[10]) + { + case 0: + sub_80DDB0C(); + gTasks[taskId].data[10]++; + break; + case 1: + if (!sContest.unk1920A_6) + { + gTasks[taskId].data[10]++; + } + break; + case 2: + if (gTasks[taskId].data[11]++ > 20) + { + gTasks[taskId].data[11] = 0; + sub_80DD940(); + sContest.unk1920A_5 = 0; + DestroyTask(taskId); + } + break; + } +} + +void unref_sub_80DDDA8(void) +{ + gSprites[sContest.applauseMeterSpriteId].pos2.x = 0; + gSprites[sContest.applauseMeterSpriteId].invisible = FALSE; +} + +void unref_sub_80DDDE4(void) +{ + gSprites[sContest.applauseMeterSpriteId].invisible = TRUE; +} + +void sub_80DDE0C(void) +{ + CreateTask(sub_80DDE30, 15); + sContest.unk1920A_7 = 1; +} + +void sub_80DDE30(u8 taskId) +{ + if (gTasks[taskId].data[10]++ > 6) + { + gTasks[taskId].data[10] = 0; + if (gTasks[taskId].data[11] == 0) + { + RequestDma3Copy(shared16800, (void *)(VRAM + 0x2000), 0x1000, 1); + } + else + { + RequestDma3Copy(shared15800, (void *)(VRAM + 0x2000), 0x1000, 1); + gTasks[taskId].data[12]++; + } + + gTasks[taskId].data[11] ^= 1; + + if (gTasks[taskId].data[12] == 9) + { + sContest.unk1920A_7 = 0; + DestroyTask(taskId); + } + } +} + +#define tBlendColor data[0] +#define tBlendCoeff data[1] + +void sub_80DDED0(s8 a, s8 b) +{ + u8 taskId = CreateTask(sub_80DDF80, 10); + u16 blendColor; + u8 blendCoeff; + u8 r3; + + if (a > 0) + { + blendColor = RGB(30, 27, 8); + if (b > 0) + { + blendCoeff = 0; + r3 = sContest.applauseLevel * 3; + } + else + { + blendCoeff = sContest.applauseLevel * 3; + r3 = 0; + } + } + else + { + blendColor = 0; + if (b > 0) + { + blendCoeff = 0; + r3 = 12; + } + else + { + blendCoeff = 12; + r3 = 0; + } + } + gTasks[taskId].tBlendColor = blendColor; + gTasks[taskId].tBlendCoeff = blendCoeff; + gTasks[taskId].data[2] = b; + gTasks[taskId].data[3] = r3; + sContest.unk1920B_0 = 0; +} + +void sub_80DDF80(u8 taskId) +{ + if (gTasks[taskId].data[10]++ >= 0) + { + gTasks[taskId].data[10] = 0; + if (gTasks[taskId].data[2] > 0) + gTasks[taskId].tBlendCoeff++; + else + gTasks[taskId].tBlendCoeff--; + BlendPalette(17, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); + BlendPalette(26, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); + if (gTasks[taskId].tBlendCoeff == gTasks[taskId].data[3]) + { + DestroyTask(taskId); + sContest.unk1920B_0 = 0; + } + } +} + +#undef tBlendColor +#undef tBlendCoeff + +void sub_80DE008(bool8 a) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + if (sContestantStatus[i].turnOrderMod != 0 && a) + { + CpuSet( + GetTurnOrderNumberGfx(i), + (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), + 0x04000008); + gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]]; + gSprites[gContestResources->field_14[i].unk1].invisible = FALSE; + } + else + { + gSprites[gContestResources->field_14[i].unk1].invisible = TRUE; + } + } +} + +const u8 *GetTurnOrderNumberGfx(u8 contestant) +{ + if (sContestantStatus[contestant].turnOrderMod != 1) + return gContestNextTurnRandomGfx; + else + return gContestNextTurnNumbersGfx + sContestantStatus[contestant].nextTurnOrder * 32; +} + +void sub_80DE12C(void) +{ + s32 r7 = 0; + u32 r10 = 2; + u32 r8 = 1; + u32 r9 = 0x11; + + for(r7 = 0; r7 < 4; r7++) + { + u32 r6; + u16 var; + if(shared192D0.unnervedPokes[r7] != 0) + if(Contest_IsMonsTurnDisabled(r7) == FALSE) + { + r6 = gUnknown_02039F26[r7] * 5 + 2; + var = sub_80DB748(3); + ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6, r10, r8, r9, r8); + var += 16; + ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6 + 1, r10, r8, r9, r8); + PlaySE(SE_C_PASI); + } + } +} + +bool8 sub_80DE1E8(u8 a) +{ + if (sContestantStatus[a].disappointedRepeat || sContestantStatus[a].nervous) + return FALSE; + else + return TRUE; +} + +#ifdef NONMATCHING +void sub_80DE224(void) +{ + s32 i; + u16 bg0Cnt; + u16 bg1Cnt; + u16 bg2Cnt; + u16 var; + + bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT); + ((struct BgCnt *)&bg1Cnt)->priority = 0; + ((struct BgCnt *)&bg1Cnt)->screenSize = 2; + ((struct BgCnt *)&bg1Cnt)->areaOverflowMode = 0; + ((struct BgCnt *)&bg1Cnt)->charBaseBlock = 0; + + + SetGpuReg(REG_OFFSET_BG1CNT, bg1Cnt); + + bg0Cnt = GetGpuReg(REG_OFFSET_BG0CNT); + ((struct BgCnt *)&bg0Cnt)->priority = 0; + + bg2Cnt = GetGpuReg(REG_OFFSET_BG2CNT); + ((struct BgCnt *)&bg2Cnt)->priority = 0; + + SetGpuReg(REG_OFFSET_BG0CNT, bg0Cnt); + SetGpuReg(REG_OFFSET_BG2CNT, bg2Cnt); + + gBattle_BG1_X = DISPLAY_WIDTH; + gBattle_BG1_Y = DISPLAY_HEIGHT; + SetGpuReg(REG_OFFSET_BG1HOFS, DISPLAY_WIDTH); + SetGpuReg(REG_OFFSET_BG1VOFS, DISPLAY_HEIGHT); + var = 0; + + CpuSet(&var, &sContest.unk19214, 0x05000400); + + CopyToBgTilemapBuffer(1, gUnknown_08C17980, 0, 0); + Contest_SetBgCopyFlags(1); + + for (i = 0; i < 4; i++) + { + gSprites[gContestResources->field_14[i].unk0].oam.priority = 1; + gSprites[gContestResources->field_14[i].unk1].oam.priority = 1; + } + + /* ((vBgCnt *)®_BG1CNT)->priority = 0; + ((vBgCnt *)®_BG1CNT)->screenSize = 1; + ((vBgCnt *)®_BG1CNT)->areaOverflowMode = 0; + + + + DmaClear32(3, (void *)(VRAM + 0xF000), 0x1000); + LZDecompressVram(gUnknown_08D17C3C, (void *)(VRAM + 0xF000)); + + ((vBgCnt *)®_BG1CNT)->charBaseBlock = 0; + + for (i = 0; i < 4; i++) + { + gSprites[shared19338[i].unk0].oam.priority = 1; + gSprites[shared19338[i].unk1].oam.priority = 1; + } + + ((vBgCnt *)®_BG2CNT)->priority = 1; + ((vBgCnt *)®_BG0CNT)->priority = 1; + ((vBgCnt *)®_BG1CNT)->screenSize = 2; */ +} +#else +NAKED +void sub_80DE224(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + sub sp, 0xC\n\ + movs r0, 0xA\n\ + bl GetGpuReg\n\ + mov r1, sp\n\ + strh r0, [r1]\n\ + mov r2, sp\n\ + ldrb r1, [r2]\n\ + movs r4, 0x4\n\ + negs r4, r4\n\ + adds r0, r4, 0\n\ + ands r0, r1\n\ + strb r0, [r2]\n\ + ldrb r1, [r2, 0x1]\n\ + movs r0, 0x3F\n\ + ands r0, r1\n\ + movs r1, 0x80\n\ + orrs r0, r1\n\ + strb r0, [r2, 0x1]\n\ + ldrb r1, [r2, 0x1]\n\ + movs r0, 0x21\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r2, 0x1]\n\ + ldrb r1, [r2]\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + mov r8, r0\n\ + ands r0, r1\n\ + strb r0, [r2]\n\ + mov r0, sp\n\ + ldrh r1, [r0]\n\ + movs r0, 0xA\n\ + bl SetGpuReg\n\ + movs r0, 0x8\n\ + bl GetGpuReg\n\ + mov r6, sp\n\ + adds r6, 0x2\n\ + strh r0, [r6]\n\ + movs r0, 0xC\n\ + bl GetGpuReg\n\ + add r5, sp, 0x4\n\ + strh r0, [r5]\n\ + ldrb r1, [r6]\n\ + adds r0, r4, 0\n\ + ands r0, r1\n\ + movs r1, 0x1\n\ + orrs r0, r1\n\ + strb r0, [r6]\n\ + ldrb r0, [r5]\n\ + ands r4, r0\n\ + orrs r4, r1\n\ + strb r4, [r5]\n\ + ldrh r1, [r6]\n\ + movs r0, 0x8\n\ + bl SetGpuReg\n\ + ldrh r1, [r5]\n\ + movs r0, 0xC\n\ + bl SetGpuReg\n\ + ldr r1, =gBattle_BG1_X\n\ + movs r0, 0xF0\n\ + strh r0, [r1]\n\ + ldr r4, =gBattle_BG1_Y\n\ + movs r0, 0xA0\n\ + strh r0, [r4]\n\ + movs r0, 0x14\n\ + movs r1, 0xF0\n\ + bl SetGpuReg\n\ + ldrh r1, [r4]\n\ + movs r0, 0x16\n\ + bl SetGpuReg\n\ + movs r0, 0\n\ + str r0, [sp, 0x8]\n\ + add r0, sp, 0x8\n\ + ldr r4, =gContestResources\n\ + ldr r1, [r4]\n\ + ldr r1, [r1, 0x28]\n\ + ldr r2, =0x05000400\n\ + bl CpuSet\n\ + ldr r1, =gUnknown_08C17980\n\ + movs r0, 0x1\n\ + movs r2, 0\n\ + movs r3, 0\n\ + bl CopyToBgTilemapBuffer\n\ + movs r0, 0x1\n\ + bl Contest_SetBgCopyFlags\n\ + movs r5, 0\n\ + ldr r7, =gSprites\n\ + movs r6, 0x4\n\ +_080DE2F0:\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x14]\n\ + lsls r3, r5, 2\n\ + adds r0, r3, r0\n\ + ldrb r0, [r0]\n\ + lsls r1, r0, 4\n\ + adds r1, r0\n\ + lsls r1, 2\n\ + adds r1, r7\n\ + ldrb r2, [r1, 0x5]\n\ + mov r0, r8\n\ + ands r0, r2\n\ + orrs r0, r6\n\ + strb r0, [r1, 0x5]\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x14]\n\ + adds r3, r0\n\ + ldrb r0, [r3, 0x1]\n\ + lsls r1, r0, 4\n\ + adds r1, r0\n\ + lsls r1, 2\n\ + adds r1, r7\n\ + ldrb r2, [r1, 0x5]\n\ + mov r0, r8\n\ + ands r0, r2\n\ + orrs r0, r6\n\ + strb r0, [r1, 0x5]\n\ + adds r5, 0x1\n\ + cmp r5, 0x3\n\ + ble _080DE2F0\n\ + add sp, 0xC\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided\n"); +} +#endif + +#ifdef NONMATCHING +void sub_80DE350(void) +{ + s32 i; + s16 var; + u16 bg1Cnt; + u8 *spriteID; + u16 something; + + RequestDma3Fill(0,(void *)(VRAM + 0x8000), 0x2000, 0x1); + //DmaClearLarge32(3, (void *)(VRAM + 0x8000), 0x2000, 0x1000); + + /*bg1Cnt = 0; + something = 0; + var = bg1Cnt; + spriteID = (u8 *)&gContestResources;*/ + + var = 0; + + + CpuSet(&var, &gContestResources->field_24[1], 0x05000400); + //CpuSet(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) + Contest_SetBgCopyFlags(1); + + //DmaClear32(3, (void *)(VRAM + 0xF000), 0x1000); + + bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT); + something = bg1Cnt; + ((struct BgCnt *) &bg1Cnt)->priority = 1; + ((struct BgCnt *) &bg1Cnt)->screenSize = 1; + ((struct BgCnt *) &bg1Cnt)->areaOverflowMode = 0; + ((struct BgCnt *) &bg1Cnt)->charBaseBlock = 2; + + SetGpuReg(REG_OFFSET_BG1CNT, bg1Cnt); + + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + + for (i = 0; i < 4; i++) + { + gSprites[gContestResources->field_14[i].unk0].oam.priority = 0; + gSprites[gContestResources->field_14[i].unk1].oam.priority = 0; + } +} +#else +NAKED +void sub_80DE350(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + sub sp, 0x8\n\ + ldr r1, =0x06008000\n\ + movs r2, 0x80\n\ + lsls r2, 6\n\ + movs r0, 0\n\ + movs r3, 0x1\n\ + bl RequestDma3Fill\n\ + movs r5, 0\n\ + str r5, [sp]\n\ + ldr r6, =gContestResources\n\ + ldr r0, [r6]\n\ + ldr r1, [r0, 0x28]\n\ + ldr r2, =0x05000400\n\ + mov r0, sp\n\ + bl CpuSet\n\ + movs r0, 0x1\n\ + bl Contest_SetBgCopyFlags\n\ + movs r0, 0xA\n\ + bl GetGpuReg\n\ + add r3, sp, 0x4\n\ + strh r0, [r3]\n\ + ldrb r1, [r3]\n\ + movs r0, 0x4\n\ + negs r0, r0\n\ + ands r0, r1\n\ + movs r1, 0x1\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + mov r1, sp\n\ + adds r1, 0x5\n\ + ldrb r2, [r1]\n\ + movs r0, 0x3F\n\ + ands r0, r2\n\ + strb r0, [r1]\n\ + ldrb r2, [r1]\n\ + movs r0, 0x21\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r1]\n\ + ldrb r1, [r3]\n\ + movs r4, 0xD\n\ + negs r4, r4\n\ + adds r0, r4, 0\n\ + ands r0, r1\n\ + movs r1, 0x8\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + ldrh r1, [r3]\n\ + movs r0, 0xA\n\ + bl SetGpuReg\n\ + ldr r0, =gBattle_BG1_X\n\ + strh r5, [r0]\n\ + ldr r0, =gBattle_BG1_Y\n\ + strh r5, [r0]\n\ + ldr r7, =gSprites\n\ +_080DE3CA:\n\ + ldr r0, [r6]\n\ + ldr r0, [r0, 0x14]\n\ + lsls r3, r5, 2\n\ + adds r0, r3, r0\n\ + ldrb r0, [r0]\n\ + lsls r1, r0, 4\n\ + adds r1, r0\n\ + lsls r1, 2\n\ + adds r1, r7\n\ + ldrb r2, [r1, 0x5]\n\ + adds r0, r4, 0\n\ + ands r0, r2\n\ + strb r0, [r1, 0x5]\n\ + ldr r0, [r6]\n\ + ldr r0, [r0, 0x14]\n\ + adds r3, r0\n\ + ldrb r0, [r3, 0x1]\n\ + lsls r1, r0, 4\n\ + adds r1, r0\n\ + lsls r1, 2\n\ + adds r1, r7\n\ + ldrb r2, [r1, 0x5]\n\ + adds r0, r4, 0\n\ + ands r0, r2\n\ + strb r0, [r1, 0x5]\n\ + adds r5, 0x1\n\ + cmp r5, 0x3\n\ + ble _080DE3CA\n\ + add sp, 0x8\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided\n"); +} +#endif + +void sub_80DE424(u8 taskId) +{ + gBattle_BG1_X = 0; + gBattle_BG1_Y = DISPLAY_HEIGHT; + PlaySE12WithPanning(SE_C_MAKU_D, 0); + gTasks[taskId].func = sub_80DE464; +} + +void sub_80DE464(u8 taskId) +{ + if ((s16)(gBattle_BG1_Y -= 7) < 0) + gBattle_BG1_Y = 0; + if (gBattle_BG1_Y == 0) + { + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[2] = 0; + gTasks[taskId].func = sub_80DE4A8; + } +} + +void sub_80DE4A8(u8 taskId) +{ + s32 i; + + switch (gTasks[taskId].data[0]) + { + case 0: + for (i = 0; i < 4; i++) + sContest.unk19218[i] = gUnknown_02039F26[i]; + sub_80DBF90(); + sub_80DC864(); + sub_80DB69C(); + sub_80DD04C(); + sub_80DE008(TRUE); + sub_80DC44C(); + gTasks[taskId].data[0] = 1; + break; + case 1: + if (gIsLinkContest & 1) + { + u8 taskId2; + + sContest.unk1920B_2 = 1; + if (sub_80DA8A4()) + sub_80DBAA0(); + taskId2 = CreateTask(sub_80FCC88, 0); + SetTaskFuncWithFollowupFunc(taskId2, sub_80FCC88, sub_80DA110); + sub_80DBF68(); + gTasks[taskId].data[0] = 2; + } + else + { + sub_80DBAA0(); + gTasks[taskId].data[0] = 3; + } + break; + case 2: + if (!sContest.unk1920B_2) + gTasks[taskId].data[0] = 3; + break; + case 3: + sub_80DB884(); + sub_80DB2BC(); + gTasks[taskId].data[0] = 0; + gTasks[taskId].func = sub_80DE5F4; + break; + } +} + +void sub_80DE5C0(u8 taskId) +{ + if ((s16)(gBattle_BG1_Y += 7) > DISPLAY_HEIGHT) + gTasks[taskId].func = sub_80DA4F4; +} + +void sub_80DE5F4(u8 taskId) +{ + if (gTasks[taskId].data[2] < 10) + { + gTasks[taskId].data[2]++; + } + else + { + if (gTasks[taskId].data[1] == 0) + { + if (gTasks[taskId].data[0] == 16) + gTasks[taskId].data[1]++; + else + gTasks[taskId].data[0]++; + } + else + { + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[2] = 0; + gTasks[taskId].func = sub_80DE65C; + } + else + { + gTasks[taskId].data[0]--; + } + } + } +} + +void sub_80DE65C(u8 taskId) +{ + if (gTasks[taskId].data[2] < 10) + { + gTasks[taskId].data[2]++; + } + else + { + gTasks[taskId].data[2] = 0; + PlaySE12WithPanning(SE_C_MAKU_U, 0); + gTasks[taskId].func = sub_80DE5C0; + } +} + +void sub_80DE69C(u8 a) +{ + s32 i; + u8 taskId; + + for (i = 0; i < 4; i++) + { + gSprites[gContestResources->field_14[i].unk0].oam.matrixNum = AllocOamMatrix(); + gSprites[gContestResources->field_14[i].unk0].oam.affineMode = 1; + StartSpriteAffineAnim(&gSprites[gContestResources->field_14[i].unk0], a); + if (a == 2) + { + AnimateSprite(&gSprites[gContestResources->field_14[i].unk0]); + gSprites[gContestResources->field_14[i].unk0].invisible = FALSE; + } + } + taskId = CreateTask(sub_80DE794, 5); + gTasks[taskId].data[0] = a; + sContest.unk1920B_1 = 1; +} + +void sub_80DE794(u8 taskId) +{ + s32 i; + + if (gSprites[gContestResources->field_14[0].unk0].affineAnimEnded) + { + if ((u8)gTasks[taskId].data[0] == 1) + { + for (i = 0; i < 4; i++) + gSprites[gContestResources->field_14[i].unk0].invisible = TRUE; + } + for (i = 0; i < 4; i++) + FreeSpriteOamMatrix(&gSprites[gContestResources->field_14[i].unk0]); + sContest.unk1920B_1 = 0; + DestroyTask(taskId); + } +} + +u16 SanitizeMove(u16 move) +{ + if (move >= MOVES_COUNT) + move = MOVE_POUND; + return move; +} + +u16 SanitizeSpecies(u16 species) +{ + if (species >= NUM_SPECIES) + species = SPECIES_NONE; + return species; +} + +void sub_80DE864(u8 a) +{ + s32 i; + u16 move = SanitizeMove(sContestantStatus[a].currMove); + u16 species = SanitizeSpecies(gContestMons[a].species); + u8 r5_2; + + memset(&gContestResources->field_18->species, 0, 0x14); + ClearBattleAnimationVars(); + for (i = 0; i < 4; i++) + gBattleMonForms[i] = 0; + switch (move) + { + case MOVE_CURSE: + if (gBaseStats[species].type1 == TYPE_GHOST || gBaseStats[species].type2 == TYPE_GHOST) + gAnimMoveTurn = 0; + else + gAnimMoveTurn = 1; + break; + case MOVE_TRANSFORM: + case MOVE_ROLE_PLAY: + r5_2 = sContestantStatus[a].unk1B; + gContestResources->field_18->unk2 = SanitizeSpecies(gContestMons[r5_2].species); + gContestResources->field_18->unk10 = gContestMons[r5_2].personality; + gContestResources->field_18->unk4_0 = 1; + break; + case MOVE_RETURN: + gAnimFriendship = 0xFF; + break; + case MOVE_FRUSTRATION: + gAnimFriendship = 0; + break; + case MOVE_SOLAR_BEAM: + case MOVE_RAZOR_WIND: + case MOVE_SKULL_BASH: + case MOVE_SKY_ATTACK: + if (sContest.unk1925E == 0) + { + sContest.unk1925E = 2; + gAnimMoveTurn = 0; + } + else + { + gAnimMoveTurn = 1; + } + break; + } + sub_80DEA5C(); +} + +void sub_80DE9B0(u8 unused) +{ + memset(&gContestResources->field_18->species, 0, 0x14); + if (sContest.unk1925E != 0) + sContest.unk1925E--; +} + +void sub_80DE9DC(u8 a) +{ + gContestResources->field_18->unk5 = a; + gContestResources->field_18->species = SanitizeSpecies(gContestMons[a].species); + gContestResources->field_18->unk8 = gContestMons[a].personality; + gContestResources->field_18->unkC = gContestMons[a].otId; +} + +void sub_80DEA20(void) +{ + gBattlerSpriteIds[3] = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); + InitSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattlerTarget]]); + sub_80DEA5C(); +} + +void sub_80DEA5C(void) +{ + struct Sprite *sprite = &gSprites[gBattlerSpriteIds[3]]; + + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->pos1.x = GetBattlerSpriteCoord(3, 0); + sprite->pos1.y = GetBattlerSpriteCoord(3, 1); + sprite->invisible = TRUE; +} + +void SelectContestMoveBankTarget(u16 move) +{ + switch (gBattleMoves[move].target) + { + case MOVE_TARGET_USER_OR_SELECTED: + case MOVE_TARGET_USER: + gBattlerTarget = 2; + break; + case MOVE_TARGET_SELECTED: + case MOVE_TARGET_RANDOM: + case MOVE_TARGET_BOTH: + case MOVE_TARGET_FOES_AND_ALLY: + default: + gBattlerTarget = 3; + break; + } +} + +#ifdef NONMATCHING +void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b) +{ + struct TextPrinterTemplate printerTemplate; + + printerTemplate.currentChar = b; + printerTemplate.windowId = a; + printerTemplate.fontId = 1; + printerTemplate.x = 0; + printerTemplate.y = 1; + printerTemplate.currentX = 0; + printerTemplate.currentY = 1; + printerTemplate.letterSpacing = 0; + printerTemplate.lineSpacing = 0; + + printerTemplate.unk = a & (1 - 0x11); + printerTemplate.unk = 0xF0; + printerTemplate.bgColor = a & (1 - 0x11) & 0x80; + + + + + AddTextPrinter(&printerTemplate, 0, 0); + PutWindowTilemap(a); + Contest_SetBgCopyFlags(0); +} +#else +NAKED +void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b) +{ + asm(".syntax unified\n\ + push {r4,lr}\n\ + sub sp, 0x10\n\ + adds r4, r0, 0\n\ + str r1, [sp]\n\ + mov r0, sp\n\ + movs r2, 0\n\ + strb r4, [r0, 0x4]\n\ + movs r1, 0x1\n\ + strb r1, [r0, 0x5]\n\ + strb r2, [r0, 0x6]\n\ + strb r1, [r0, 0x7]\n\ + strb r2, [r0, 0x8]\n\ + strb r1, [r0, 0x9]\n\ + strb r2, [r0, 0xA]\n\ + strb r2, [r0, 0xB]\n\ + mov r3, sp\n\ + ldrb r2, [r3, 0xC]\n\ + subs r1, 0x11\n\ + adds r0, r1, 0\n\ + ands r0, r2\n\ + strb r0, [r3, 0xC]\n\ + mov r2, sp\n\ + movs r0, 0xF0\n\ + strb r0, [r2, 0xC]\n\ + ldrb r0, [r2, 0xD]\n\ + ands r1, r0\n\ + strb r1, [r2, 0xD]\n\ + mov r1, sp\n\ + movs r0, 0x80\n\ + strb r0, [r1, 0xD]\n\ + mov r0, sp\n\ + movs r1, 0\n\ + movs r2, 0\n\ + bl AddTextPrinter\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + adds r0, r4, 0\n\ + bl PutWindowTilemap\n\ + movs r0, 0\n\ + bl Contest_SetBgCopyFlags\n\ + add sp, 0x10\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif + +#ifdef NONMATCHING +void Contest_PrintTextToBg0WindowAt(u32 a, u8 *b, s32 c, u8 d, u8 e) +{ + struct TextPrinterTemplate printerTemplate; + + printerTemplate.currentChar = b; + printerTemplate.windowId = a; + printerTemplate.fontId = 1; + printerTemplate.x = c; + printerTemplate.y = d; + printerTemplate.currentX = c; + printerTemplate.currentY = d; + printerTemplate.letterSpacing = 0; + printerTemplate.lineSpacing = 0; + + printerTemplate.unk = a & (1 - 0x10); + printerTemplate.unk = 0xF0; + printerTemplate.bgColor = a & (1 - 0x11) & 0x80; + + + + + AddTextPrinter(&printerTemplate, 0, 0); + PutWindowTilemap(a); + Contest_SetBgCopyFlags(0); +} +#else +NAKED +void Contest_PrintTextToBg0WindowAt(u32 a, u8 *b, s32 c, u8 d, u8 e) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + sub sp, 0x10\n\ + adds r5, r0, 0\n\ + ldr r4, [sp, 0x1C]\n\ + str r1, [sp]\n\ + mov r0, sp\n\ + movs r1, 0\n\ + strb r5, [r0, 0x4]\n\ + strb r4, [r0, 0x5]\n\ + strb r2, [r0, 0x6]\n\ + strb r3, [r0, 0x7]\n\ + strb r2, [r0, 0x8]\n\ + strb r3, [r0, 0x9]\n\ + strb r1, [r0, 0xA]\n\ + strb r1, [r0, 0xB]\n\ + mov r3, sp\n\ + ldrb r2, [r3, 0xC]\n\ + subs r1, 0x10\n\ + adds r0, r1, 0\n\ + ands r0, r2\n\ + strb r0, [r3, 0xC]\n\ + mov r2, sp\n\ + movs r0, 0xF0\n\ + strb r0, [r2, 0xC]\n\ + ldrb r0, [r2, 0xD]\n\ + ands r1, r0\n\ + strb r1, [r2, 0xD]\n\ + mov r1, sp\n\ + movs r0, 0x80\n\ + strb r0, [r1, 0xD]\n\ + mov r0, sp\n\ + movs r1, 0\n\ + movs r2, 0\n\ + bl AddTextPrinter\n\ + lsls r5, 24\n\ + lsrs r5, 24\n\ + adds r0, r5, 0\n\ + bl PutWindowTilemap\n\ + movs r0, 0\n\ + bl Contest_SetBgCopyFlags\n\ + add sp, 0x10\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif + +#ifdef NONMATCHING +void Contest_StartTextPrinter(const u8 *a, u32 b) +{ + struct TextPrinterTemplate printerTemplate; + u8 var; + + printerTemplate.currentChar = a; + printerTemplate.windowId = b; + printerTemplate.fontId = 1; + printerTemplate.x = 0; + printerTemplate.y = 1; + printerTemplate.currentX = 0; + printerTemplate.currentY = 1; + printerTemplate.letterSpacing = 0; + printerTemplate.lineSpacing = 0; + + printerTemplate.unk = b & -0x10; + printerTemplate.unk = 0x10; + printerTemplate.bgColor = b & (1 - 0x10) & 0x80; + + if(!b) + { + var = 0; + AddTextPrinter(&printerTemplate, var, 0); + } + else + { + if(gIsLinkContest & 1) + { + var = 4; + AddTextPrinter(&printerTemplate, var, 0); + } + else + { + var = GetPlayerTextSpeedDelay(); + AddTextPrinter(&printerTemplate, var, 0); + } + } + + PutWindowTilemap(4); + Contest_SetBgCopyFlags(0); + +} +} +#else +NAKED +void Contest_StartTextPrinter(const u8 *a, u32 b) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + sub sp, 0x10\n\ + str r0, [sp]\n\ + mov r2, sp\n\ + movs r3, 0\n\ + movs r0, 0x4\n\ + strb r0, [r2, 0x4]\n\ + mov r0, sp\n\ + movs r5, 0x1\n\ + strb r5, [r0, 0x5]\n\ + strb r3, [r0, 0x6]\n\ + strb r5, [r0, 0x7]\n\ + strb r3, [r0, 0x8]\n\ + strb r5, [r0, 0x9]\n\ + strb r3, [r0, 0xA]\n\ + strb r3, [r0, 0xB]\n\ + mov r4, sp\n\ + ldrb r3, [r4, 0xC]\n\ + movs r2, 0x10\n\ + negs r2, r2\n\ + adds r0, r2, 0\n\ + ands r0, r3\n\ + strb r0, [r4, 0xC]\n\ + mov r3, sp\n\ + movs r0, 0x10\n\ + strb r0, [r3, 0xC]\n\ + ldrb r0, [r3, 0xD]\n\ + ands r2, r0\n\ + strb r2, [r3, 0xD]\n\ + mov r2, sp\n\ + movs r0, 0x80\n\ + strb r0, [r2, 0xD]\n\ + cmp r1, 0\n\ + bne _080DEC80\n\ + mov r0, sp\n\ + movs r1, 0\n\ + movs r2, 0\n\ + bl AddTextPrinter\n\ + b _080DECA4\n\ +_080DEC80:\n\ + ldr r0, =gIsLinkContest\n\ + ldrb r1, [r0]\n\ + adds r0, r5, 0\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DEC94\n\ + movs r1, 0x4\n\ + b _080DEC9C\n\ + .pool\n\ +_080DEC94:\n\ + bl GetPlayerTextSpeedDelay\n\ + lsls r0, 24\n\ + lsrs r1, r0, 24\n\ +_080DEC9C:\n\ + mov r0, sp\n\ + movs r2, 0\n\ + bl AddTextPrinter\n\ +_080DECA4:\n\ + movs r0, 0x4\n\ + bl PutWindowTilemap\n\ + movs r0, 0\n\ + bl Contest_SetBgCopyFlags\n\ + add sp, 0x10\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif + +#ifdef NONMATCHING +void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, u8 h) +{ + s16 var = h; + WriteSequenceToBgTilemapBuffer(a, b, c, d, e, f, g, var); + Contest_SetBgCopyFlags(a); +} +#else +NAKED +void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, u8 h) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + sub sp, 0x10\n\ + mov r8, r0\n\ + ldr r0, [sp, 0x28]\n\ + ldr r4, [sp, 0x2C]\n\ + ldr r5, [sp, 0x30]\n\ + ldr r6, [sp, 0x34]\n\ + mov r7, r8\n\ + lsls r7, 24\n\ + lsrs r7, 24\n\ + mov r8, r7\n\ + lsls r1, 16\n\ + lsrs r1, 16\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + lsls r3, 24\n\ + lsrs r3, 24\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + lsls r5, 24\n\ + lsrs r5, 24\n\ + str r0, [sp]\n\ + str r4, [sp, 0x4]\n\ + str r5, [sp, 0x8]\n\ + lsls r6, 16\n\ + asrs r6, 16\n\ + str r6, [sp, 0xC]\n\ + mov r0, r8\n\ + bl WriteSequenceToBgTilemapBuffer\n\ + mov r0, r8\n\ + bl Contest_SetBgCopyFlags\n\ + add sp, 0x10\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif + +void ContestBG_FillBoxWithTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g) +{ + ContestBG_FillBoxWithIncrementingTile(a, b, c, d, e, f, g, 0); +} + +bool32 Contest_RunTextPrinters(void) +{ + RunTextPrinters(); + return IsTextPrinterActive(4); +} + +void Contest_SetBgCopyFlags(u32 var) +{ + sContestBgCopyFlags |= 1 << var; +} + +void ResetContestLinkResults(void) +{ + s32 i; + s32 j; + + for(i = 0; i < 5; i++) + for(j = 0; j < 4; j++) + gSaveBlock2Ptr->contestLinkResults[i][j] = 0; +} + +bool8 sub_80DEDA8(u8 a) +{ + s32 i; + u8 r7 = Random() % 3; + + for (i = 0; i < 3; i++) + { + if (gContestFinalStandings[i] == 0) + break; + } + if (a == 0xFF && i != gContestPlayerMonIndex) + return FALSE; + switch (gSpecialVar_ContestCategory) + { + case CONTEST_CATEGORY_COOL: + r7 += 0; + break; + case CONTEST_CATEGORY_BEAUTY: + r7 += 3; + break; + case CONTEST_CATEGORY_CUTE: + r7 += 6; + break; + case CONTEST_CATEGORY_SMART: + r7 += 9; + break; + case CONTEST_CATEGORY_TOUGH: + r7 += 12; + break; + } + if (a != 0xFE) + { + u8 r4 = sub_80DEFA8(a, 1); + + gSaveBlock1Ptr->contestWinners[r4].personality = gContestMons[i].personality; + gSaveBlock1Ptr->contestWinners[r4].species = gContestMons[i].species; + gSaveBlock1Ptr->contestWinners[r4].trainerId = gContestMons[i].otId; + StringCopy(gSaveBlock1Ptr->contestWinners[r4].monName, gContestMons[i].nickname); + StringCopy(gSaveBlock1Ptr->contestWinners[r4].trainerName, gContestMons[i].trainerName); + if(gIsLinkContest & 1) + gSaveBlock1Ptr->contestWinners[r4].contestRank = 4; + else + gSaveBlock1Ptr->contestWinners[r4].contestRank = gSpecialVar_ContestRank; + + if (a != 0xFF) + gSaveBlock1Ptr->contestWinners[r4].contestCategory = gSpecialVar_ContestCategory; + else + gSaveBlock1Ptr->contestWinners[r4].contestCategory = r7; + } + else + { + gUnknown_02039F3C.personality = gContestMons[i].personality; + gUnknown_02039F3C.trainerId = gContestMons[i].otId; + gUnknown_02039F3C.species = gContestMons[i].species; + StringCopy(gUnknown_02039F3C.monName, gContestMons[i].nickname); + StringCopy(gUnknown_02039F3C.trainerName, gContestMons[i].trainerName); + gUnknown_02039F3C.contestCategory = r7; + } + return TRUE; +} + +u8 sub_80DEFA8(u8 a, u8 b) +{ + s32 i; + + switch (a) + { + case 0: + case 1: + case 2: + case 3: + if (b != 0) + { + for (i = 5; i >= 1; i--) + memcpy(&gSaveBlock1Ptr->contestWinners[i], &gSaveBlock1Ptr->contestWinners[i - 1], sizeof(struct ContestWinner)); + } + return 0; + default: + switch (gSpecialVar_ContestCategory) + { + case CONTEST_CATEGORY_COOL: + return 8; + case CONTEST_CATEGORY_BEAUTY: + return 9; + case CONTEST_CATEGORY_CUTE: + return 10; + case CONTEST_CATEGORY_SMART: + return 11; + case CONTEST_CATEGORY_TOUGH: + default: + return 12; + } + } +} + +void ClearContestWinnerPicsInContestHall(void) +{ + s32 i; + + for (i = 0; i < 8; i++) + gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i]; +} + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/graphics.c b/src/graphics.c index 10efd50437..4786f1f226 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1023,8 +1023,8 @@ const u32 gBattleAnimSpriteSheet_262[] = INCBIN_U32("graphics/battle_anims/sprit const u32 gBattleAnimSpritePalette_262[] = INCBIN_U32("graphics/battle_anims/sprites/262.gbapal.lz"); const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/nextturn.4bpp.lz"); -const u8 gUnknown_08D8E9B4[] = INCBIN_U8("graphics/contest/nextturn_numbers.4bpp"); -const u8 gUnknown_08D8EA34[] = INCBIN_U8("graphics/contest/nextturn_random.4bpp"); +const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/nextturn_numbers.4bpp"); +const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/nextturn_random.4bpp"); const u32 gBattleAnimSpriteSheet_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.4bpp.lz"); const u32 gBattleAnimSpritePalette_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.gbapal.lz"); From b8ff71e65e6eae5e57e5ef53894f233f57a0c14d Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 6 Jan 2019 14:11:31 -0800 Subject: [PATCH 05/42] Fix build conflicts. --- src/contest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/contest.c b/src/contest.c index a74e2c96b6..ccd8740a51 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3327,7 +3327,7 @@ void sub_80DC4F0(void) LoadSpritePalette(&gUnknown_08587B08); for (i = 0; i < 4; i++) { - LoadCompressedObjectPic(&gUnknown_08587AE8[i]); + LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]); gContestResources->field_14[i].unk1 = CreateSprite( &gSpriteTemplate_8587B18[i], 204, gUnknown_08587A70[gUnknown_02039F26[i]], @@ -3341,7 +3341,7 @@ void CreateApplauseMeterSprite(void) { u8 spriteId; - LoadCompressedObjectPic(&gUnknown_08587BB0); + LoadCompressedSpriteSheet(&gUnknown_08587BB0); LoadSpritePalette(&gUnknown_08587BB8); spriteId = CreateSprite(&gSpriteTemplate_8587BC8, 30, 44, 1); gSprites[spriteId].invisible = TRUE; @@ -3509,7 +3509,7 @@ u8 sub_80DC9EC(u8 a) volatile u8 zero; - LoadCompressedObjectPic(&gUnknown_08589904[a]); + LoadCompressedSpriteSheet(&gUnknown_08589904[a]); LoadSpritePalette(&gUnknown_08589924[a]); r6 = CreateSprite(&gSpriteTemplate_858998C[a], 184, r5, 29); gSprites[r8].oam.tileNum += 64; @@ -3562,7 +3562,7 @@ u8 sub_80DC9EC(u8 a) lsls r4, r1, 3\n\ ldr r0, =gUnknown_08589904\n\ adds r0, r4, r0\n\ - bl LoadCompressedObjectPic\n\ + bl LoadCompressedSpriteSheet\n\ ldr r0, =gUnknown_08589924\n\ adds r4, r0\n\ adds r0, r4, 0\n\ From f828823bf0a959e39659d4e125bbd0937169a4bc Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 27 Jan 2019 20:21:30 -0800 Subject: [PATCH 06/42] Make changes --- src/contest.c | 62 ++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/src/contest.c b/src/contest.c index ccd8740a51..9b69df98bc 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3045,7 +3045,7 @@ void sub_80DBED4(void) if ((gIsLinkContest & 1)) { gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] = - ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 0x270F) ? 0x270F : + ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 9999) ? 9999 : (gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1); } @@ -3218,7 +3218,9 @@ void sub_80DC0F4(u8 taskId) m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256); } else + { PlaySE(SE_BOO); + } if (!r11 && !r5 && !r6) gTasks[taskId].data[2] = -gTasks[taskId].data[2]; @@ -3328,10 +3330,7 @@ void sub_80DC4F0(void) for (i = 0; i < 4; i++) { LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]); - gContestResources->field_14[i].unk1 = CreateSprite( - &gSpriteTemplate_8587B18[i], - 204, gUnknown_08587A70[gUnknown_02039F26[i]], - 0); + gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i], 204, gUnknown_08587A70[gUnknown_02039F26[i]], 0); SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80); gSprites[gContestResources->field_14[i].unk1].invisible = TRUE; } @@ -3444,18 +3443,9 @@ void sub_80DC87C(u8 a) sub_80DC81C(a); r0 = a + 5; - DmaCopy16Defvars( - 3, - gPlttBufferUnfaded + r0 * 16 + 10, - gPlttBufferFaded + r0 * 16 + 10, - 2); - + DmaCopy16Defvars(3, gPlttBufferUnfaded + r0 * 16 + 10, gPlttBufferFaded + r0 * 16 + 10, 2); var = (a + 5) * 16 + 12 + a; - DmaCopy16Defvars( - 3, - gPlttBufferUnfaded + var, - gPlttBufferFaded + var, - 2); + DmaCopy16Defvars(3, gPlttBufferUnfaded + var, gPlttBufferFaded + var, 2); } void sub_80DC8D0(u8 taskId) @@ -3718,8 +3708,8 @@ void sub_80DCB78(u8 spriteId) void sub_80DCBB4(void) { - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x0907); + SetGpuReg(REG_OFFSET_BLDCNT, BLDALPHA_BLEND(BLDCNT_EFFECT_BLEND, BLDCNT_TGT1_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1| BLDCNT_TGT1_BG2, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG3)); } void sub_80DCBD0(void) @@ -3780,7 +3770,9 @@ void sub_80DCD08(void) sub_80DB2BC(); } else + { sub_80DCD48(); + } } #ifdef NONMATCHING @@ -4781,8 +4773,8 @@ void sub_80DD940(void) src = gContestApplauseMeterGfx + 64; else src = gContestApplauseMeterGfx; - CpuSet(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 0x04000008); - CpuSet(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 0x04000008); + CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); + CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); if (sContest.applauseLevel > 4) sub_80DDA20(); @@ -5031,10 +5023,7 @@ void sub_80DE008(bool8 a) { if (sContestantStatus[i].turnOrderMod != 0 && a) { - CpuSet( - GetTurnOrderNumberGfx(i), - (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), - 0x04000008); + CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32); gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]]; gSprites[gContestResources->field_14[i].unk1].invisible = FALSE; } @@ -6167,27 +6156,4 @@ void ClearContestWinnerPicsInContestHall(void) for (i = 0; i < 8; i++) gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i]; -} - - - - - - - - - - - - - - - - - - - - - - - +} \ No newline at end of file From d633ee6f585d4d0f1b7af806a7b72ffc1719844a Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 27 Jan 2019 20:48:18 -0800 Subject: [PATCH 07/42] Minor changes --- src/contest.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/contest.c b/src/contest.c index 9b69df98bc..95a09ba586 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3218,9 +3218,9 @@ void sub_80DC0F4(u8 taskId) m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256); } else - { + { PlaySE(SE_BOO); - } + } if (!r11 && !r5 && !r6) gTasks[taskId].data[2] = -gTasks[taskId].data[2]; @@ -3330,7 +3330,10 @@ void sub_80DC4F0(void) for (i = 0; i < 4; i++) { LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]); - gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i], 204, gUnknown_08587A70[gUnknown_02039F26[i]], 0); + gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i], + 204, + gUnknown_08587A70[gUnknown_02039F26[i]], + 0); SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80); gSprites[gContestResources->field_14[i].unk1].invisible = TRUE; } @@ -3443,9 +3446,15 @@ void sub_80DC87C(u8 a) sub_80DC81C(a); r0 = a + 5; - DmaCopy16Defvars(3, gPlttBufferUnfaded + r0 * 16 + 10, gPlttBufferFaded + r0 * 16 + 10, 2); + DmaCopy16Defvars(3, + gPlttBufferUnfaded + r0 * 16 + 10, + gPlttBufferFaded + r0 * 16 + 10, + 2); var = (a + 5) * 16 + 12 + a; - DmaCopy16Defvars(3, gPlttBufferUnfaded + var, gPlttBufferFaded + var, 2); + DmaCopy16Defvars(3, + gPlttBufferUnfaded + var, + gPlttBufferFaded + var, + 2); } void sub_80DC8D0(u8 taskId) @@ -3708,7 +3717,7 @@ void sub_80DCB78(u8 spriteId) void sub_80DCBB4(void) { - SetGpuReg(REG_OFFSET_BLDCNT, BLDALPHA_BLEND(BLDCNT_EFFECT_BLEND, BLDCNT_TGT1_ALL)); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1| BLDCNT_TGT1_BG2, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG3)); } @@ -3770,9 +3779,9 @@ void sub_80DCD08(void) sub_80DB2BC(); } else - { + { sub_80DCD48(); - } + } } #ifdef NONMATCHING From 72720204da48a77132ce17c2429aaa9854497e2c Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 27 Jan 2019 20:54:21 -0800 Subject: [PATCH 08/42] Fix stuff --- src/contest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contest.c b/src/contest.c index 95a09ba586..04c64d709b 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3718,7 +3718,7 @@ void sub_80DCB78(u8 spriteId) void sub_80DCBB4(void) { SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1| BLDCNT_TGT1_BG2, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG3)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(7, 9)); } void sub_80DCBD0(void) From 26a2a4f9e71e05638686bed9d42da126593400c9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 28 Jan 2019 12:29:47 +0100 Subject: [PATCH 09/42] Match all of contest functions --- src/contest.c | 2004 +++++++------------------------------------------ 1 file changed, 282 insertions(+), 1722 deletions(-) diff --git a/src/contest.c b/src/contest.c index 04c64d709b..e6e96b5ddf 100644 --- a/src/contest.c +++ b/src/contest.c @@ -128,9 +128,9 @@ void sub_80DE350(void); void sub_80DE424(u8); void sub_80DE69C(u8); void sub_80DEA20(void); -void Contest_PrintTextToBg0WindowAt(u32, u8 *, s32, u8, u8); +void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s32 fontId); void Contest_StartTextPrinter(const u8 *, u32); -void ContestBG_FillBoxWithIncrementingTile(u8, u16, u8, u8, u8, u8, u8, u8); +void ContestBG_FillBoxWithIncrementingTile(u8, u16, u8, u8, u8, u8, u8, s16); bool32 Contest_RunTextPrinters(void); void Contest_SetBgCopyFlags(u32); void sub_80FC9F8(u8); @@ -662,7 +662,6 @@ void sub_80D80C8(u8 taskId) } } - void sub_80D8108(u8 taskId) { switch (gTasks[taskId].data[0]) @@ -2028,7 +2027,6 @@ bool8 sub_80DA8A4(void) return FALSE; } - void sub_80DA8C8(u8 partyIndex) { u8 name[20]; @@ -2164,48 +2162,41 @@ void sub_80DAB8C(u8 contestType, u8 rank) sub_80DA8C8(gContestMonPartyIndex); } -#ifdef NONMATCHING void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) { - s32 i; + s32 i, j; u8 opponentsCount = 0; u8 opponents[100]; - const u8 * r6; if (gNumLinkContestPlayers == 4) return; - r6 = gUnknown_085898A4; for (i = 0; i < ARRAY_COUNT(gContestOpponents); i++) { if (rank != gContestOpponents[i].whichRank) continue; + if (isPostgame == TRUE) { - if (r6[i] == 1) + if (gUnknown_085898A4[i] == 1) continue; } else { - if (r6[i] == 2) + if (gUnknown_085898A4[i] == 2) continue; } - if (contestType == CONTEST_CATEGORY_COOL && gContestOpponents[i].aiPool_Cool) - opponents[opponentsCount++] = i; - else if (contestType == CONTEST_CATEGORY_BEAUTY && gContestOpponents[i].aiPool_Beauty) - opponents[opponentsCount++] = i; - else if (contestType == CONTEST_CATEGORY_CUTE && gContestOpponents[i].aiPool_Cute) - opponents[opponentsCount++] = i; - else if (contestType == CONTEST_CATEGORY_SMART && gContestOpponents[i].aiPool_Smart) - opponents[opponentsCount++] = i; - else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough) + if ((contestType == CONTEST_CATEGORY_COOL && gContestOpponents[i].aiPool_Cool) + || (contestType == CONTEST_CATEGORY_BEAUTY && gContestOpponents[i].aiPool_Beauty) + || (contestType == CONTEST_CATEGORY_CUTE && gContestOpponents[i].aiPool_Cute) + || (contestType == CONTEST_CATEGORY_SMART && gContestOpponents[i].aiPool_Smart) + || (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough)) opponents[opponentsCount++] = i; } opponents[opponentsCount] = 0xFF; for (i = 0; i < 4 - gNumLinkContestPlayers; i++) { u16 rnd = sub_80F903C() % opponentsCount; - s32 j; gContestMons[gNumLinkContestPlayers + i] = gContestOpponents[opponents[rnd]]; sub_80DF9D4(gContestMons[gNumLinkContestPlayers + i].trainerName); @@ -2215,180 +2206,6 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) opponentsCount--; } } -#else -NAKED void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r9\n" - "\tmov r6, r8\n" - "\tpush {r6,r7}\n" - "\tsub sp, 0x64\n" - "\tmov r8, r2\n" - "\tlsls r0, 24\n" - "\tlsrs r4, r0, 24\n" - "\tlsls r1, 24\n" - "\tlsrs r2, r1, 24\n" - "\tmovs r7, 0\n" - "\tldr r0, =gNumLinkContestPlayers\n" - "\tldrb r1, [r0]\n" - "\tmov r9, r0\n" - "\tcmp r1, 0x4\n" - "\tbne _080DACDE\n" - "\tb _080DADF6\n" - "_080DACDE:\n" - "\tmovs r5, 0\n" - "\tldr r3, =gContestOpponents\n" - "\tldr r6, =gUnknown_085898A4\n" - "_080DACE4:\n" - "\tldrb r0, [r3, 0x1C]\n" - "\tlsls r0, 30\n" - "\tlsrs r0, 30\n" - "\tcmp r2, r0\n" - "\tbne _080DAD56\n" - "\tmov r0, r8\n" - "\tcmp r0, 0x1\n" - "\tbne _080DAD08\n" - "\tldrb r0, [r6]\n" - "\tcmp r0, 0x1\n" - "\tbeq _080DAD56\n" - "\tb _080DAD0E\n" - "\t.pool\n" - "_080DAD08:\n" - "\tldrb r0, [r6]\n" - "\tcmp r0, 0x2\n" - "\tbeq _080DAD56\n" - "_080DAD0E:\n" - "\tcmp r4, 0\n" - "\tbne _080DAD1A\n" - "\tldrb r0, [r3, 0x1C]\n" - "\tlsls r0, 29\n" - "\tcmp r0, 0\n" - "\tblt _080DAD4A\n" - "_080DAD1A:\n" - "\tcmp r4, 0x1\n" - "\tbne _080DAD26\n" - "\tldrb r0, [r3, 0x1C]\n" - "\tlsls r0, 28\n" - "\tcmp r0, 0\n" - "\tblt _080DAD4A\n" - "_080DAD26:\n" - "\tcmp r4, 0x2\n" - "\tbne _080DAD32\n" - "\tldrb r0, [r3, 0x1C]\n" - "\tlsls r0, 27\n" - "\tcmp r0, 0\n" - "\tblt _080DAD4A\n" - "_080DAD32:\n" - "\tcmp r4, 0x3\n" - "\tbne _080DAD3E\n" - "\tldrb r0, [r3, 0x1C]\n" - "\tlsls r0, 26\n" - "\tcmp r0, 0\n" - "\tblt _080DAD4A\n" - "_080DAD3E:\n" - "\tcmp r4, 0x4\n" - "\tbne _080DAD56\n" - "\tldrb r0, [r3, 0x1C]\n" - "\tlsls r0, 25\n" - "\tcmp r0, 0\n" - "\tbge _080DAD56\n" - "_080DAD4A:\n" - "\tadds r0, r7, 0\n" - "\tadds r1, r0, 0x1\n" - "\tlsls r1, 24\n" - "\tlsrs r7, r1, 24\n" - "\tadd r0, sp\n" - "\tstrb r5, [r0]\n" - "_080DAD56:\n" - "\tadds r3, 0x40\n" - "\tadds r6, 0x1\n" - "\tadds r5, 0x1\n" - "\tcmp r5, 0x5F\n" - "\tbls _080DACE4\n" - "\tmov r3, sp\n" - "\tadds r1, r3, r7\n" - "\tmovs r0, 0xFF\n" - "\tstrb r0, [r1]\n" - "\tmovs r5, 0\n" - "\tmov r0, r9\n" - "\tldrb r1, [r0]\n" - "\tmovs r0, 0x4\n" - "\tsubs r0, r1\n" - "\tcmp r5, r0\n" - "\tbge _080DADF6\n" - "\tldr r3, =gContestMons\n" - "\tmov r8, r3\n" - "\tmov r6, r9\n" - "\tmovs r0, 0x2\n" - "\tadd r0, r8\n" - "\tmov r9, r0\n" - "_080DAD82:\n" - "\tbl sub_80F903C\n" - "\tlsls r0, 16\n" - "\tlsrs r0, 16\n" - "\tadds r1, r7, 0\n" - "\tbl __modsi3\n" - "\tadds r1, r0, 0\n" - "\tlsls r1, 16\n" - "\tlsrs r1, 16\n" - "\tldrb r0, [r6]\n" - "\tadds r0, r5\n" - "\tlsls r0, 6\n" - "\tadd r0, r8\n" - "\tldr r2, =gContestOpponents\n" - "\tmov r3, sp\n" - "\tadds r4, r3, r1\n" - "\tldrb r1, [r4]\n" - "\tlsls r1, 6\n" - "\tadds r1, r2\n" - "\tmovs r2, 0x40\n" - "\tbl memcpy\n" - "\tldrb r0, [r6]\n" - "\tadds r0, r5\n" - "\tlsls r0, 6\n" - "\tmov r1, r8\n" - "\tadds r1, 0xD\n" - "\tadds r0, r1\n" - "\tbl sub_80DF9D4\n" - "\tldrb r0, [r6]\n" - "\tadds r0, r5\n" - "\tlsls r0, 6\n" - "\tadd r0, r9\n" - "\tmovs r1, 0x2\n" - "\tbl sub_80DF9E0\n" - "\tldrb r0, [r4]\n" - "\tadds r3, r5, 0x1\n" - "\tsubs r1, r7, 0x1\n" - "\tcmp r0, 0xFF\n" - "\tbeq _080DADE6\n" - "\tadds r2, r4, 0\n" - "_080DADDA:\n" - "\tldrb r0, [r2, 0x1]\n" - "\tstrb r0, [r2]\n" - "\tadds r2, 0x1\n" - "\tldrb r0, [r2]\n" - "\tcmp r0, 0xFF\n" - "\tbne _080DADDA\n" - "_080DADE6:\n" - "\tlsls r0, r1, 24\n" - "\tlsrs r7, r0, 24\n" - "\tadds r5, r3, 0\n" - "\tldrb r1, [r6]\n" - "\tmovs r0, 0x4\n" - "\tsubs r0, r1\n" - "\tcmp r5, r0\n" - "\tblt _080DAD82\n" - "_080DADF6:\n" - "\tadd sp, 0x64\n" - "\tpop {r3,r4}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.pool"); -} -#endif // GetContestAvailability? u8 sub_80DAE0C(struct Pokemon *pkmn) @@ -2445,7 +2262,7 @@ void sub_80DAEA4(void) } } -u8 * sub_80DAED4(const u8 * src, u8 color) +u8 *sub_80DAED4(const u8 *src, u8 color) { u8 * ptr = StringCopy(gDisplayedStringBattle, gText_ColorTransparent); ptr[-1] = color; @@ -2822,7 +2639,7 @@ u16 GetChosenMove(u8 a) ContestAI_ResetAI(a); moveChoice = ContestAI_GetActionToUse(); return gContestMons[a].moves[moveChoice]; - } + } } void sub_80DB918(void) @@ -2830,7 +2647,7 @@ void sub_80DB918(void) s32 i; for (i = 0; i < 4; i++) - sContestantStatus[i].currMove = GetChosenMove(i); + sContestantStatus[i].currMove = GetChosenMove(i); } void sub_80DB944(void) @@ -3044,10 +2861,10 @@ void sub_80DBED4(void) { if ((gIsLinkContest & 1)) { - gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] = + gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] = ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 9999) ? 9999 : (gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1); - + } } @@ -3081,7 +2898,7 @@ void sub_80DBF68(void) void sub_80DBF90(void) { int i; - + for(i = 0; i < 4; i++) { ContestBG_FillBoxWithTile(0, 0, 0x16, 2 + i * 5, 8, 2, 0x11); @@ -3147,7 +2964,7 @@ void sub_80DC0F4(u8 taskId) u8 r5; u8 r10; u8 r11; - + gTasks[taskId].data[10] = 0; if (gTasks[taskId].data[1] == 0) { @@ -3204,7 +3021,7 @@ void sub_80DC0F4(u8 taskId) } r10 = r5; r11 = 0; - + if (r5 > 7) { r11 = 1; @@ -3221,7 +3038,7 @@ void sub_80DC0F4(u8 taskId) { PlaySE(SE_BOO); } - + if (!r11 && !r5 && !r6) gTasks[taskId].data[2] = -gTasks[taskId].data[2]; } @@ -3330,9 +3147,9 @@ void sub_80DC4F0(void) for (i = 0; i < 4; i++) { LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]); - gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i], - 204, - gUnknown_08587A70[gUnknown_02039F26[i]], + gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i], + 204, + gUnknown_08587A70[gUnknown_02039F26[i]], 0); SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80); gSprites[gContestResources->field_14[i].unk1].invisible = TRUE; @@ -3446,14 +3263,14 @@ void sub_80DC87C(u8 a) sub_80DC81C(a); r0 = a + 5; - DmaCopy16Defvars(3, - gPlttBufferUnfaded + r0 * 16 + 10, - gPlttBufferFaded + r0 * 16 + 10, + DmaCopy16Defvars(3, + gPlttBufferUnfaded + r0 * 16 + 10, + gPlttBufferFaded + r0 * 16 + 10, 2); var = (a + 5) * 16 + 12 + a; - DmaCopy16Defvars(3, - gPlttBufferUnfaded + var, - gPlttBufferFaded + var, + DmaCopy16Defvars(3, + gPlttBufferUnfaded + var, + gPlttBufferFaded + var, 2); } @@ -3499,212 +3316,49 @@ extern const struct CompressedSpriteSheet gUnknown_08589904[]; extern const struct SpritePalette gUnknown_08589924[]; extern const struct SpriteTemplate gSpriteTemplate_858998C[]; -#ifdef NONMATCHING u8 sub_80DC9EC(u8 a) { - u8 r5 = gUnknown_02039F26[a] * 40 + 32; - u8 r8; - u8 r6; - volatile u8 zero; - + u8 spriteId1, spriteId2; + u8 x = gUnknown_02039F26[a] * 40 + 32; LoadCompressedSpriteSheet(&gUnknown_08589904[a]); LoadSpritePalette(&gUnknown_08589924[a]); - r6 = CreateSprite(&gSpriteTemplate_858998C[a], 184, r5, 29); - gSprites[r8].oam.tileNum += 64; - r8 = CreateSprite(&gSpriteTemplate_858998C[a], 248, r5, 29); - + spriteId1 = CreateSprite(&gSpriteTemplate_858998C[a], 184, x, 29); + spriteId2 = CreateSprite(&gSpriteTemplate_858998C[a], 248, x, 29); + gSprites[spriteId2].oam.tileNum += 64; - CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x26), (u8 *)(VRAM + 0x10000 + gSprites[r6].oam.tileNum * 32)); - CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), (u8 *)(VRAM + 0x10000 + gSprites[r8].oam.tileNum * 32)); - CpuSet(&r8, (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), 0x050000c0); + CopySpriteTiles(0, + 3, + (void *)VRAM, + (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x26), + gContestResources->field_34); - RequestDma3Copy((void *)(VRAM + 0x10000 + (0x28 + gSprites[r6].oam.tileNum) * 32), (u8 *)(VRAM + 0x10000 + gSprites[r8].oam.tileNum * 32), 0x80, 1); + CopySpriteTiles(0, + 3, (void *)VRAM, + (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), + gContestResources->field_38); - // What is this? - zero = 0; - zero = 0; + CpuFill32(0, gContestResources->field_34 + 0x500, 0x300); + CpuFill32(0, gContestResources->field_38 + 0x500, 0x300); - RequestDma3Copy((void *)(VRAM + 0x10000 + (0x28 + gSprites[r6].oam.tileNum) * 32), (u8 *)(VRAM + 0x10000 + gSprites[r6].oam.tileNum * 32), 0x80, 1); + RequestDma3Copy(gContestResources->field_34, + (u8 *)(VRAM + 0x10000 + gSprites[spriteId1].oam.tileNum * 32), + 0x800, + 1); + RequestDma3Copy(gContestResources->field_38, + (u8 *)(VRAM + 0x10000 + gSprites[spriteId2].oam.tileNum * 32), + 0x800, + 1); - gSprites[r6].data[0] = r8; - gSprites[r8].data[0] = r6; - - return r6; + gSprites[spriteId1].data[0] = spriteId2; + gSprites[spriteId2].data[0] = spriteId1; + + gSprites[spriteId1].data[1] = a; + gSprites[spriteId2].data[1] = a; + + return spriteId1; } -#else -NAKED -u8 sub_80DC9EC(u8 a) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x10\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0xC]\n\ - ldr r6, =gUnknown_02039F26\n\ - adds r6, r0, r6\n\ - ldrb r0, [r6]\n\ - lsls r5, r0, 2\n\ - adds r5, r0\n\ - lsls r5, 27\n\ - movs r0, 0x80\n\ - lsls r0, 22\n\ - adds r5, r0\n\ - lsrs r5, 24\n\ - ldr r1, [sp, 0xC]\n\ - lsls r4, r1, 3\n\ - ldr r0, =gUnknown_08589904\n\ - adds r0, r4, r0\n\ - bl LoadCompressedSpriteSheet\n\ - ldr r0, =gUnknown_08589924\n\ - adds r4, r0\n\ - adds r0, r4, 0\n\ - bl LoadSpritePalette\n\ - ldr r2, [sp, 0xC]\n\ - lsls r4, r2, 1\n\ - adds r4, r2\n\ - lsls r4, 3\n\ - ldr r0, =gSpriteTemplate_858998C\n\ - adds r4, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB8\n\ - adds r2, r5, 0\n\ - movs r3, 0x1D\n\ - bl CreateSprite\n\ - mov r9, r0\n\ - mov r3, r9\n\ - lsls r3, 24\n\ - lsrs r3, 24\n\ - mov r9, r3\n\ - adds r0, r4, 0\n\ - movs r1, 0xF8\n\ - adds r2, r5, 0\n\ - movs r3, 0x1D\n\ - bl CreateSprite\n\ - mov r8, r0\n\ - mov r0, r8\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - lsls r5, r0, 4\n\ - add r5, r8\n\ - lsls r5, 2\n\ - ldr r1, =gSprites\n\ - adds r5, r1\n\ - ldrh r2, [r5, 0x4]\n\ - lsls r1, r2, 22\n\ - lsrs r1, 22\n\ - adds r1, 0x40\n\ - ldr r3, =0x000003ff\n\ - adds r0, r3, 0\n\ - ands r1, r0\n\ - ldr r0, =0xfffffc00\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strh r0, [r5, 0x4]\n\ - movs r4, 0xC0\n\ - lsls r4, 19\n\ - ldrb r0, [r6]\n\ - lsls r3, r0, 2\n\ - adds r3, r0\n\ - lsls r3, 6\n\ - ldr r0, =0x0600e026\n\ - adds r3, r0\n\ - ldr r7, =gContestResources\n\ - ldr r0, [r7]\n\ - ldr r0, [r0, 0x34]\n\ - str r0, [sp]\n\ - movs r0, 0\n\ - movs r1, 0x3\n\ - adds r2, r4, 0\n\ - bl CopySpriteTiles\n\ - ldrb r0, [r6]\n\ - lsls r3, r0, 2\n\ - adds r3, r0\n\ - lsls r3, 6\n\ - ldr r1, =0x0600e036\n\ - adds r3, r1\n\ - ldr r0, [r7]\n\ - ldr r0, [r0, 0x38]\n\ - str r0, [sp]\n\ - movs r0, 0\n\ - movs r1, 0x3\n\ - adds r2, r4, 0\n\ - bl CopySpriteTiles\n\ - movs r4, 0\n\ - str r4, [sp, 0x4]\n\ - ldr r0, [r7]\n\ - ldr r1, [r0, 0x34]\n\ - movs r6, 0xA0\n\ - lsls r6, 3\n\ - adds r1, r6\n\ - ldr r2, =0x050000c0\n\ - mov r10, r2\n\ - add r0, sp, 0x4\n\ - bl CpuSet\n\ - str r4, [sp, 0x8]\n\ - add r0, sp, 0x8\n\ - ldr r1, [r7]\n\ - ldr r1, [r1, 0x38]\n\ - adds r1, r6\n\ - mov r2, r10\n\ - bl CpuSet\n\ - ldr r0, [r7]\n\ - ldr r0, [r0, 0x34]\n\ - mov r3, r9\n\ - lsls r4, r3, 4\n\ - add r4, r9\n\ - lsls r4, 2\n\ - ldr r1, =gSprites\n\ - adds r4, r1\n\ - ldrh r1, [r4, 0x4]\n\ - lsls r1, 22\n\ - lsrs r1, 17\n\ - ldr r6, =0x06010000\n\ - adds r1, r6\n\ - movs r2, 0x80\n\ - lsls r2, 4\n\ - mov r10, r2\n\ - movs r3, 0x1\n\ - bl RequestDma3Copy\n\ - ldr r0, [r7]\n\ - ldr r0, [r0, 0x38]\n\ - ldrh r1, [r5, 0x4]\n\ - lsls r1, 22\n\ - lsrs r1, 17\n\ - adds r1, r6\n\ - mov r2, r10\n\ - movs r3, 0x1\n\ - bl RequestDma3Copy\n\ - mov r3, r8\n\ - strh r3, [r4, 0x2E]\n\ - mov r0, r9\n\ - strh r0, [r5, 0x2E]\n\ - mov r1, sp\n\ - ldrh r1, [r1, 0xC]\n\ - strh r1, [r4, 0x30]\n\ - mov r2, sp\n\ - ldrh r2, [r2, 0xC]\n\ - strh r2, [r5, 0x30]\n\ - mov r0, r9\n\ - add sp, 0x10\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .pool\n\ - .syntax divided\n"); -} -#endif void sub_80DCB78(u8 spriteId) { @@ -3772,7 +3426,7 @@ void sub_80DCD08(void) gHeap[0x1A000] = 0; else gHeap[0x1A000] = 1; - + if(gHeap[0x1A000] == 0) { sub_80DAEA4(); @@ -3784,191 +3438,55 @@ void sub_80DCD08(void) } } -#ifdef NONMATCHING void sub_80DCD48(void) { - u8 r5 = 0; - u8 sp8[8]; + u8 i; + s16 value; + u8 *txtPtr; + u8 text[8]; - if (gUnknown_020322D5 != 0) + if (gUnknown_020322D5 == 0) + return; + + switch (gHeap[0x1A000]) { - u8 i; - s16 r2; - - + case 0: + break; + case 2: + case 3: + sub_80DF750(); + break; + default: + for (i = 0; i < 4; i++) + FillWindowPixelBuffer(i, 0); for (i = 0; i < 4; i++) { - r2 = sContestantStatus[i].unk4; - if (r2 < 0) + value = sContestantStatus[i].unk4; + txtPtr = text; + if (sContestantStatus[i].unk4 < 0) { - r2 = -r2; - sp8[0] = CHAR_HYPHEN; - r5++; + value *= -1; + txtPtr = StringCopy(txtPtr, gText_OneDash); } - ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4); - Text_InitWindowAndPrintText( - &gUnknown_03004210, - sp8, - 592 + gUnknown_02039F26[i] * 22, - gUnknown_083CA310[gUnknown_02039F26[i]][0], - gUnknown_083CA310[gUnknown_02039F26[i]][1]); - r5 = 0; + ConvertIntToDecimalStringN(txtPtr, value, STR_CONV_MODE_LEFT_ALIGN, 4); + Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text, 55, 1, 7); } for (i = 0; i < 4; i++) { - r2 = sContestantStatus[i].appeal2; - if (r2 < 0) + value = sContestantStatus[i].appeal2; + txtPtr = text; + if (sContestantStatus[i].appeal2 < 0) { - r2 = -r2; - sp8[0] = CHAR_HYPHEN; - r5++; + value *= -1; + txtPtr = StringCopy(txtPtr, gText_OneDash); } - ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4); - Text_InitWindowAndPrintText( - &gUnknown_03004210, - sp8, - 512 + gUnknown_02039F26[i] * 20, - gUnknown_083CA308[gUnknown_02039F26[i]][0], - gUnknown_083CA308[gUnknown_02039F26[i]][1]); - r5 = 0; + ConvertIntToDecimalStringN(txtPtr, value, STR_CONV_MODE_LEFT_ALIGN, 4); + Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text, 5, 1, 7); } - sub_80AEB30(); + sub_80DB2BC(); + break; } } -#else -NAKED -void sub_80DCD48(void) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - sub sp, 0xC\n\ - ldr r0, =gUnknown_020322D5\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080DCE44\n\ - ldr r0, =gHeap\n\ - movs r1, 0xD0\n\ - lsls r1, 9\n\ - adds r0, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080DCE44\n\ - cmp r0, 0\n\ - blt _080DCD7C\n\ - cmp r0, 0x3\n\ - bgt _080DCD7C\n\ - cmp r0, 0x2\n\ - blt _080DCD7C\n\ - bl sub_80DF750\n\ - b _080DCE44\n\ - .pool\n\ -_080DCD7C:\n\ - movs r5, 0\n\ -_080DCD7E:\n\ - adds r0, r5, 0\n\ - movs r1, 0\n\ - bl FillWindowPixelBuffer\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - cmp r5, 0x3\n\ - bls _080DCD7E\n\ - movs r5, 0\n\ -_080DCD92:\n\ - ldr r0, =gContestResources\n\ - ldr r0, [r0]\n\ - ldr r1, [r0, 0x4]\n\ - lsls r0, r5, 3\n\ - subs r0, r5\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - add r2, sp, 0x4\n\ - ldrh r4, [r0, 0x4]\n\ - movs r1, 0x4\n\ - ldrsh r0, [r0, r1]\n\ - cmp r0, 0\n\ - bge _080DCDBC\n\ - negs r0, r0\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r0, r2, 0\n\ - ldr r1, =gText_OneDash\n\ - bl StringCopy\n\ - adds r2, r0, 0\n\ -_080DCDBC:\n\ - lsls r1, r4, 16\n\ - asrs r1, 16\n\ - adds r0, r2, 0\n\ - movs r2, 0\n\ - movs r3, 0x4\n\ - bl ConvertIntToDecimalStringN\n\ - ldr r0, =gUnknown_02039F26\n\ - adds r0, r5, r0\n\ - ldrb r0, [r0]\n\ - movs r1, 0x7\n\ - str r1, [sp]\n\ - add r1, sp, 0x4\n\ - movs r2, 0x37\n\ - movs r3, 0x1\n\ - bl Contest_PrintTextToBg0WindowAt\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - cmp r5, 0x3\n\ - bls _080DCD92\n\ - movs r5, 0\n\ -_080DCDEA:\n\ - ldr r0, =gContestResources\n\ - ldr r0, [r0]\n\ - ldr r1, [r0, 0x4]\n\ - lsls r0, r5, 3\n\ - subs r0, r5\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - add r2, sp, 0x4\n\ - ldrh r4, [r0, 0x2]\n\ - movs r1, 0x2\n\ - ldrsh r0, [r0, r1]\n\ - cmp r0, 0\n\ - bge _080DCE14\n\ - negs r0, r0\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r0, r2, 0\n\ - ldr r1, =gText_OneDash\n\ - bl StringCopy\n\ - adds r2, r0, 0\n\ -_080DCE14:\n\ - lsls r1, r4, 16\n\ - asrs r1, 16\n\ - adds r0, r2, 0\n\ - movs r2, 0\n\ - movs r3, 0x4\n\ - bl ConvertIntToDecimalStringN\n\ - ldr r0, =gUnknown_02039F26\n\ - adds r0, r5, r0\n\ - ldrb r0, [r0]\n\ - movs r1, 0x7\n\ - str r1, [sp]\n\ - add r1, sp, 0x4\n\ - movs r2, 0x5\n\ - movs r3, 0x1\n\ - bl Contest_PrintTextToBg0WindowAt\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - cmp r5, 0x3\n\ - bls _080DCDEA\n\ - bl sub_80DB2BC\n\ -_080DCE44:\n\ - add sp, 0xC\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided\n"); -} -#endif void sub_80DCE58(u8 a) { @@ -4062,550 +3580,122 @@ void sub_80DD04C(void) sub_80DAEA4(); } -#ifdef NONMATCHING void sub_80DD080(u8 contestant) { + u16 move; + u8 effect; + u8 rnd; bool8 r8; s32 i; sContestantStatus[contestant].appeal2 = 0; sContestantStatus[contestant].appeal1 = 0; r8 = sub_80DBA68(contestant); - if (r8) + if (!r8) + return; + + move = sContestantStatus[contestant].currMove; + effect = gContestMoves[move].effect; + + sContestantStatus[contestant].moveCategory = gContestMoves[sContestantStatus[contestant].currMove].contestCategory; + if (sContestantStatus[contestant].currMove == sContestantStatus[contestant].prevMove && sContestantStatus[contestant].currMove != MOVE_NONE) { - u16 move = sContestantStatus[contestant].currMove; - u8 effect = gContestMoves[move].effect; - u8 rnd; - - sContestantStatus[contestant].moveCategory = gContestMoves[sContestantStatus[contestant].currMove].contestCategory; - if (sContestantStatus[contestant].currMove == sContestantStatus[contestant].prevMove && sContestantStatus[contestant].currMove != MOVE_NONE) - { - sContestantStatus[contestant].disappointedRepeat = TRUE; - sContestantStatus[contestant].moveRepeatCount++; - } - else - { - sContestantStatus[contestant].moveRepeatCount = 0; - } - sContestantStatus[contestant].appeal1 = gContestEffects[effect].appeal; - sContestantStatus[contestant].appeal2 = gContestEffects[effect].appeal; - shared192D0.jam = gContestEffects[effect].jam; - shared192D0.jam2 = shared192D0.jam; - shared192D0.jam2 = gContestEffects[effect].jam; - - shared192D0.contestant = contestant; - for (i = 0; i < 4; i++) - { - sContestantStatus[i].jam = 0; - shared192D0.unnervedPokes[i] = 0; - } - if (sContestantStatus[contestant].hasJudgesAttention && AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove) == 0) - sContestantStatus[contestant].hasJudgesAttention = 0; - sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition; - gContestEffectFuncs[effect](); - if (sContestantStatus[contestant].conditionMod == 1) - sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition - 10; - else if (sContestantStatus[contestant].appealTripleCondition) - sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition * 3; - - - sContestantStatus[contestant].unk16 = 0; - sContestantStatus[contestant].unk15_6 = 0; - if (sub_80DE1E8(contestant)) - { - u8 r2 = AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove); - - if (r2 != 0 && sContestantStatus[contestant].hasJudgesAttention) - { - sContestantStatus[contestant].unk16 = r2; - sContestantStatus[contestant].unk15_6 = 1; - sContestantStatus[contestant].hasJudgesAttention = 0; - sContestantStatus[contestant].unk17 = sContestantStatus[contestant].appeal1 * sContestantStatus[contestant].unk16; - sContestantStatus[contestant].unk15_3 = 1; - } - else - { - if (gContestMoves[sContestantStatus[contestant].currMove].comboStarterId != 0) - { - sContestantStatus[contestant].hasJudgesAttention = 1; - sContestantStatus[contestant].unk15_6 = 1; - } - else - { - sContestantStatus[contestant].hasJudgesAttention = 0; - } - } - } - if (sContestantStatus[contestant].disappointedRepeat) - sContestantStatus[contestant].unk18 = (sContestantStatus[contestant].moveRepeatCount + 1) * 10; - if (sContestantStatus[contestant].nervous) - { - sContestantStatus[contestant].hasJudgesAttention = 0; - sContestantStatus[contestant].appeal2 = 0; - sContestantStatus[contestant].appeal1 = 0; - } - shared19328.bits_0 = Contest_GetMoveExcitement(sContestantStatus[contestant].currMove); - if (sContestantStatus[contestant].overrideCategoryExcitementMod) - shared19328.bits_0 = 1; - if (shared19328.bits_0 > 0) - { - if (sContest.applauseLevel + shared19328.bits_0 > 4) - shared19328.unk2 = 60; - else - shared19328.unk2 = 10; - } - else - { - shared19328.unk2 = 0; - } - - rnd = Random() % 3; - for (i = 0; i < 4; i++) - { - if (i != contestant) - { - if (rnd == 0) - break; - rnd--; - } - } - sContestantStatus[contestant].unk1B = i; + sContestantStatus[contestant].disappointedRepeat = TRUE; + sContestantStatus[contestant].moveRepeatCount++; } -} + else + { + sContestantStatus[contestant].moveRepeatCount = 0; + } + sContestantStatus[contestant].appeal1 = gContestEffects[effect].appeal; + sContestantStatus[contestant].appeal2 = sContestantStatus[contestant].appeal1; + shared192D0.jam = gContestEffects[effect].jam; + shared192D0.jam2 = shared192D0.jam; -#else -NAKED -void sub_80DD080(u8 contestant) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6,r7}\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - ldr r4, =gContestResources\n\ - ldr r3, [r4]\n\ - ldr r1, [r3, 0x4]\n\ - lsls r7, r6, 3\n\ - subs r0, r7, r6\n\ - lsls r5, r0, 2\n\ - adds r1, r5, r1\n\ - movs r2, 0\n\ - strh r2, [r1, 0x2]\n\ - ldr r0, [r3, 0x4]\n\ - adds r0, r5, r0\n\ - strh r2, [r0]\n\ - adds r0, r6, 0\n\ - bl sub_80DBA68\n\ - lsls r0, 24\n\ - mov r8, r4\n\ - cmp r0, 0\n\ - bne _080DD0B4\n\ - b _080DD3C4\n\ -_080DD0B4:\n\ - ldr r0, [r4]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r5, r1\n\ - ldrh r0, [r1, 0x6]\n\ - ldr r2, =gContestMoves\n\ - lsls r0, 3\n\ - adds r0, r2\n\ - ldrb r2, [r0]\n\ - mov r9, r2\n\ - ldrb r0, [r0, 0x1]\n\ - lsls r0, 29\n\ - lsrs r0, 29\n\ - strb r0, [r1, 0xA]\n\ - ldr r0, [r4]\n\ - ldr r0, [r0, 0x4]\n\ - adds r2, r5, r0\n\ - ldrh r0, [r2, 0x6]\n\ - ldrh r1, [r2, 0x8]\n\ - cmp r0, r1\n\ - bne _080DD110\n\ - cmp r0, 0\n\ - beq _080DD110\n\ - ldrb r0, [r2, 0x15]\n\ - movs r1, 0x1\n\ - orrs r0, r1\n\ - strb r0, [r2, 0x15]\n\ - ldr r0, [r4]\n\ - ldr r2, [r0, 0x4]\n\ - adds r2, r5, r2\n\ - ldrb r3, [r2, 0xB]\n\ - lsls r1, r3, 25\n\ - lsrs r1, 29\n\ - adds r1, 0x1\n\ - movs r0, 0x7\n\ - ands r1, r0\n\ - lsls r1, 4\n\ - movs r0, 0x71\n\ - negs r0, r0\n\ - ands r0, r3\n\ - orrs r0, r1\n\ - strb r0, [r2, 0xB]\n\ - b _080DD12C\n\ - .pool\n\ -_080DD110:\n\ - ldr r4, =gContestResources\n\ - ldr r0, [r4]\n\ - ldr r0, [r0, 0x4]\n\ - lsls r3, r6, 3\n\ - subs r1, r3, r6\n\ - lsls r1, 2\n\ - adds r1, r0\n\ - ldrb r2, [r1, 0xB]\n\ - movs r0, 0x71\n\ - negs r0, r0\n\ - ands r0, r2\n\ - strb r0, [r1, 0xB]\n\ - mov r8, r4\n\ - adds r7, r3, 0\n\ -_080DD12C:\n\ - mov r2, r8\n\ - ldr r4, [r2]\n\ - ldr r2, [r4, 0x4]\n\ - subs r0, r7, r6\n\ - lsls r0, 2\n\ - adds r2, r0, r2\n\ - ldr r3, =gContestEffects\n\ - mov r1, r9\n\ - lsls r5, r1, 2\n\ - adds r3, r5, r3\n\ - ldrb r1, [r3, 0x1]\n\ - strh r1, [r2]\n\ - ldr r1, [r4, 0x4]\n\ - adds r0, r1\n\ - ldrh r1, [r0]\n\ - strh r1, [r0, 0x2]\n\ - ldr r1, [r4, 0x8]\n\ - ldrb r0, [r3, 0x2]\n\ - strh r0, [r1, 0x4]\n\ - ldr r1, [r4, 0x8]\n\ - ldrh r0, [r1, 0x4]\n\ - strh r0, [r1, 0x6]\n\ - ldr r0, [r4, 0x8]\n\ - strb r6, [r0, 0x11]\n\ - movs r2, 0\n\ - mov r9, r5\n\ - mov r4, r8\n\ - movs r3, 0\n\ - movs r1, 0\n\ -_080DD166:\n\ - ldr r0, [r4]\n\ - ldr r0, [r0, 0x4]\n\ - adds r0, r1, r0\n\ - strb r3, [r0, 0xE]\n\ - ldr r0, [r4]\n\ - ldr r0, [r0, 0x8]\n\ - adds r0, 0xD\n\ - adds r0, r2\n\ - strb r3, [r0]\n\ - adds r1, 0x1C\n\ - adds r2, 0x1\n\ - cmp r2, 0x3\n\ - ble _080DD166\n\ - ldr r5, =gContestResources\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - subs r0, r7, r6\n\ - lsls r4, r0, 2\n\ - adds r2, r4, r1\n\ - ldrb r1, [r2, 0x15]\n\ - movs r0, 0x10\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DD1B4\n\ - ldrh r0, [r2, 0x8]\n\ - ldrh r1, [r2, 0x6]\n\ - bl AreMovesContestCombo\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080DD1B4\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r4, r1\n\ - ldrb r2, [r1, 0x15]\n\ - movs r0, 0x11\n\ - negs r0, r0\n\ - ands r0, r2\n\ - strb r0, [r1, 0x15]\n\ -_080DD1B4:\n\ - ldr r0, =gContestEffectFuncs\n\ - add r0, r9\n\ - ldr r0, [r0]\n\ - bl _call_via_r0\n\ - ldr r0, =gContestResources\n\ - ldr r0, [r0]\n\ - ldr r1, [r0, 0x4]\n\ - subs r0, r7, r6\n\ - lsls r0, 2\n\ - adds r2, r0, r1\n\ - ldrb r1, [r2, 0x10]\n\ - movs r0, 0x30\n\ - ands r0, r1\n\ - cmp r0, 0x10\n\ - bne _080DD1EC\n\ - ldrh r1, [r2, 0x2]\n\ - subs r1, 0xA\n\ - movs r0, 0xD\n\ - ldrsb r0, [r2, r0]\n\ - b _080DD206\n\ - .pool\n\ -_080DD1EC:\n\ - ldrb r1, [r2, 0x11]\n\ - movs r0, 0x20\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DD200\n\ - movs r1, 0xD\n\ - ldrsb r1, [r2, r1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - b _080DD204\n\ -_080DD200:\n\ - movs r0, 0xD\n\ - ldrsb r0, [r2, r0]\n\ -_080DD204:\n\ - ldrh r1, [r2, 0x2]\n\ -_080DD206:\n\ - adds r0, r1\n\ - strh r0, [r2, 0x2]\n\ - ldr r5, =gContestResources\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - subs r0, r7, r6\n\ - lsls r4, r0, 2\n\ - adds r1, r4, r1\n\ - movs r0, 0\n\ - strb r0, [r1, 0x16]\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r4, r1\n\ - ldrb r2, [r1, 0x15]\n\ - movs r0, 0x41\n\ - negs r0, r0\n\ - ands r0, r2\n\ - strb r0, [r1, 0x15]\n\ - adds r0, r6, 0\n\ - bl sub_80DE1E8\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080DD2E2\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r4, r1\n\ - ldrh r0, [r1, 0x8]\n\ - ldrh r1, [r1, 0x6]\n\ - bl AreMovesContestCombo\n\ - lsls r0, 24\n\ - lsrs r3, r0, 24\n\ - cmp r3, 0\n\ - beq _080DD29C\n\ - ldr r0, [r5]\n\ - ldr r0, [r0, 0x4]\n\ - adds r2, r4, r0\n\ - ldrb r1, [r2, 0x15]\n\ - movs r0, 0x10\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DD29C\n\ - strb r3, [r2, 0x16]\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r4, r1\n\ - ldrb r0, [r1, 0x15]\n\ - movs r2, 0x40\n\ - orrs r0, r2\n\ - strb r0, [r1, 0x15]\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r4, r1\n\ - ldrb r2, [r1, 0x15]\n\ - movs r0, 0x11\n\ - negs r0, r0\n\ - ands r0, r2\n\ - strb r0, [r1, 0x15]\n\ - ldr r0, [r5]\n\ - ldr r0, [r0, 0x4]\n\ - adds r0, r4, r0\n\ - movs r1, 0\n\ - ldrsh r2, [r0, r1]\n\ - ldrb r1, [r0, 0x16]\n\ - muls r1, r2\n\ - strb r1, [r0, 0x17]\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r4, r1\n\ - ldrb r0, [r1, 0x15]\n\ - movs r2, 0x8\n\ - b _080DD2C8\n\ - .pool\n\ -_080DD29C:\n\ - ldr r2, =gContestMoves\n\ - ldr r5, =gContestResources\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - subs r0, r7, r6\n\ - lsls r4, r0, 2\n\ - adds r3, r4, r1\n\ - ldrh r0, [r3, 0x6]\n\ - lsls r0, 3\n\ - adds r0, r2\n\ - ldrb r0, [r0, 0x2]\n\ - cmp r0, 0\n\ - beq _080DD2D8\n\ - ldrb r0, [r3, 0x15]\n\ - movs r1, 0x10\n\ - orrs r0, r1\n\ - strb r0, [r3, 0x15]\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - adds r1, r4, r1\n\ - ldrb r0, [r1, 0x15]\n\ - movs r2, 0x40\n\ -_080DD2C8:\n\ - orrs r0, r2\n\ - strb r0, [r1, 0x15]\n\ - b _080DD2E2\n\ - .pool\n\ -_080DD2D8:\n\ - ldrb r1, [r3, 0x15]\n\ - movs r0, 0x11\n\ - negs r0, r0\n\ - ands r0, r1\n\ - strb r0, [r3, 0x15]\n\ -_080DD2E2:\n\ - ldr r5, =gContestResources\n\ - ldr r0, [r5]\n\ - ldr r1, [r0, 0x4]\n\ - subs r0, r7, r6\n\ - lsls r4, r0, 2\n\ - adds r2, r4, r1\n\ - ldrb r1, [r2, 0x15]\n\ - movs r0, 0x1\n\ - mov r8, r0\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DD30A\n\ - ldrb r0, [r2, 0xB]\n\ - lsls r0, 25\n\ - lsrs r0, 29\n\ - adds r0, 0x1\n\ - lsls r1, r0, 2\n\ - adds r1, r0\n\ - lsls r1, 1\n\ - strb r1, [r2, 0x18]\n\ -_080DD30A:\n\ - ldr r0, [r5]\n\ - ldr r0, [r0, 0x4]\n\ - adds r2, r4, r0\n\ - ldrb r1, [r2, 0xC]\n\ - mov r0, r8\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DD334\n\ - ldrb r1, [r2, 0x15]\n\ - movs r0, 0x11\n\ - negs r0, r0\n\ - ands r0, r1\n\ - strb r0, [r2, 0x15]\n\ - ldr r2, [r5]\n\ - ldr r0, [r2, 0x4]\n\ - adds r0, r4, r0\n\ - movs r1, 0\n\ - strh r1, [r0, 0x2]\n\ - ldr r0, [r2, 0x4]\n\ - adds r0, r4, r0\n\ - strh r1, [r0]\n\ -_080DD334:\n\ - ldr r0, [r5]\n\ - ldr r0, [r0, 0x4]\n\ - adds r0, r4, r0\n\ - ldrh r0, [r0, 0x6]\n\ - bl Contest_GetMoveExcitement\n\ - ldr r1, [r5]\n\ - ldr r1, [r1, 0x10]\n\ - strb r0, [r1]\n\ - ldr r2, [r5]\n\ - ldr r0, [r2, 0x4]\n\ - adds r0, r4, r0\n\ - ldrb r1, [r0, 0x11]\n\ - movs r0, 0x10\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DD35C\n\ - ldr r0, [r2, 0x10]\n\ - mov r1, r8\n\ - strb r1, [r0]\n\ -_080DD35C:\n\ - ldr r1, [r5]\n\ - ldr r3, [r1, 0x10]\n\ - movs r0, 0\n\ - ldrsb r0, [r3, r0]\n\ - cmp r0, 0\n\ - ble _080DD388\n\ - ldr r0, [r1]\n\ - ldrb r0, [r0, 0x13]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - movs r1, 0\n\ - ldrsb r1, [r3, r1]\n\ - adds r0, r1\n\ - cmp r0, 0x4\n\ - ble _080DD384\n\ - movs r0, 0x3C\n\ - b _080DD38A\n\ - .pool\n\ -_080DD384:\n\ - movs r0, 0xA\n\ - b _080DD38A\n\ -_080DD388:\n\ - movs r0, 0\n\ -_080DD38A:\n\ - strb r0, [r3, 0x2]\n\ - bl Random\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0x3\n\ - bl __umodsi3\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - movs r2, 0\n\ - b _080DD3AE\n\ -_080DD3A2:\n\ - subs r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ -_080DD3A8:\n\ - adds r2, 0x1\n\ - cmp r2, 0x3\n\ - bgt _080DD3B6\n\ -_080DD3AE:\n\ - cmp r2, r6\n\ - beq _080DD3A8\n\ - cmp r0, 0\n\ - bne _080DD3A2\n\ -_080DD3B6:\n\ - ldr r0, =gContestResources\n\ - ldr r0, [r0]\n\ - ldr r1, [r0, 0x4]\n\ - subs r0, r7, r6\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - strb r2, [r0, 0x1B]\n\ -_080DD3C4:\n\ - pop {r3,r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided\n"); + shared192D0.contestant = contestant; + for (i = 0; i < 4; i++) + { + sContestantStatus[i].jam = 0; + shared192D0.unnervedPokes[i] = 0; + } + + if (sContestantStatus[contestant].hasJudgesAttention + && !AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove)) + sContestantStatus[contestant].hasJudgesAttention = 0; + + gContestEffectFuncs[effect](); + + if (sContestantStatus[contestant].conditionMod == 1) + sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition - 10; + else if (sContestantStatus[contestant].appealTripleCondition) + sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition * 3; + else + sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition; + + sContestantStatus[contestant].unk16 = 0; + sContestantStatus[contestant].unk15_6 = 0; + if (sub_80DE1E8(contestant)) + { + u8 r2 = AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove); + + if (r2 != 0 && sContestantStatus[contestant].hasJudgesAttention) + { + sContestantStatus[contestant].unk16 = r2; + sContestantStatus[contestant].unk15_6 = 1; + sContestantStatus[contestant].hasJudgesAttention = 0; + sContestantStatus[contestant].unk17 = sContestantStatus[contestant].appeal1 * sContestantStatus[contestant].unk16; + sContestantStatus[contestant].unk15_3 = 1; + } + else + { + if (gContestMoves[sContestantStatus[contestant].currMove].comboStarterId != 0) + { + sContestantStatus[contestant].hasJudgesAttention = 1; + sContestantStatus[contestant].unk15_6 = 1; + } + else + { + sContestantStatus[contestant].hasJudgesAttention = 0; + } + } + } + if (sContestantStatus[contestant].disappointedRepeat) + sContestantStatus[contestant].unk18 = (sContestantStatus[contestant].moveRepeatCount + 1) * 10; + + if (sContestantStatus[contestant].nervous) + { + sContestantStatus[contestant].hasJudgesAttention = 0; + sContestantStatus[contestant].appeal2 = 0; + sContestantStatus[contestant].appeal1 = 0; + } + shared19328.bits_0 = Contest_GetMoveExcitement(sContestantStatus[contestant].currMove); + if (sContestantStatus[contestant].overrideCategoryExcitementMod) + shared19328.bits_0 = 1; + + if (shared19328.bits_0 > 0) + { + if (sContest.applauseLevel + shared19328.bits_0 > 4) + shared19328.unk2 = 60; + else + shared19328.unk2 = 10; + } + else + { + shared19328.unk2 = 0; + } + + rnd = Random() % 3; + for (i = 0; i < 4; i++) + { + if (i != contestant) + { + if (rnd == 0) + break; + rnd--; + } + } + sContestantStatus[contestant].unk1B = i; } -#endif void SetContestantEffectStringID(u8 a, u8 b) { @@ -4782,9 +3872,9 @@ void sub_80DD940(void) src = gContestApplauseMeterGfx + 64; else src = gContestApplauseMeterGfx; - CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); - CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); - + CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); + CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); + if (sContest.applauseLevel > 4) sub_80DDA20(); } @@ -5054,24 +4144,22 @@ const u8 *GetTurnOrderNumberGfx(u8 contestant) void sub_80DE12C(void) { s32 r7 = 0; - u32 r10 = 2; - u32 r8 = 1; - u32 r9 = 0x11; - - for(r7 = 0; r7 < 4; r7++) + u8 r10 = 2; + u8 r8 = 1; + u8 r9 = 0x11; + + for (r7 = 0; r7 < 4; r7++) { - u32 r6; - u16 var; - if(shared192D0.unnervedPokes[r7] != 0) - if(Contest_IsMonsTurnDisabled(r7) == FALSE) - { - r6 = gUnknown_02039F26[r7] * 5 + 2; - var = sub_80DB748(3); - ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6, r10, r8, r9, r8); - var += 16; - ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6 + 1, r10, r8, r9, r8); - PlaySE(SE_C_PASI); - } + if (shared192D0.unnervedPokes[r7] != 0 && !Contest_IsMonsTurnDisabled(r7)) + { + u32 r6 = gUnknown_02039F26[r7] * 5 + 2; + u16 var = sub_80DB748(3); + + ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6, r10, r8, r9, r8); + var += 16; + ContestBG_FillBoxWithIncrementingTile(0, var, 0x14, r6 + 1, r10, r8, r9, r8); + PlaySE(SE_C_PASI); + } } } @@ -5083,242 +4171,58 @@ bool8 sub_80DE1E8(u8 a) return TRUE; } -#ifdef NONMATCHING void sub_80DE224(void) { s32 i; - u16 bg0Cnt; - u16 bg1Cnt; - u16 bg2Cnt; - u16 var; + u16 bg0Cnt, bg1Cnt, bg2Cnt; bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT); - ((struct BgCnt *)&bg1Cnt)->priority = 0; - ((struct BgCnt *)&bg1Cnt)->screenSize = 2; - ((struct BgCnt *)&bg1Cnt)->areaOverflowMode = 0; - ((struct BgCnt *)&bg1Cnt)->charBaseBlock = 0; - - + ((vBgCnt *)&bg1Cnt)->priority = 0; + ((vBgCnt *)&bg1Cnt)->screenSize = 2; + ((vBgCnt *)&bg1Cnt)->areaOverflowMode = 0; + ((vBgCnt *)&bg1Cnt)->charBaseBlock = 0; + SetGpuReg(REG_OFFSET_BG1CNT, bg1Cnt); - + bg0Cnt = GetGpuReg(REG_OFFSET_BG0CNT); - ((struct BgCnt *)&bg0Cnt)->priority = 0; - bg2Cnt = GetGpuReg(REG_OFFSET_BG2CNT); - ((struct BgCnt *)&bg2Cnt)->priority = 0; - + ((vBgCnt *)&bg0Cnt)->priority = 1; + ((vBgCnt *)&bg2Cnt)->priority = 1; + SetGpuReg(REG_OFFSET_BG0CNT, bg0Cnt); SetGpuReg(REG_OFFSET_BG2CNT, bg2Cnt); - + gBattle_BG1_X = DISPLAY_WIDTH; gBattle_BG1_Y = DISPLAY_HEIGHT; - SetGpuReg(REG_OFFSET_BG1HOFS, DISPLAY_WIDTH); - SetGpuReg(REG_OFFSET_BG1VOFS, DISPLAY_HEIGHT); - var = 0; - - CpuSet(&var, &sContest.unk19214, 0x05000400); - + SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); + SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); + + CpuFill32(0, gContestResources->field_24[1], 0x1000); + CopyToBgTilemapBuffer(1, gUnknown_08C17980, 0, 0); Contest_SetBgCopyFlags(1); - + for (i = 0; i < 4; i++) { gSprites[gContestResources->field_14[i].unk0].oam.priority = 1; gSprites[gContestResources->field_14[i].unk1].oam.priority = 1; } - - /* ((vBgCnt *)®_BG1CNT)->priority = 0; - ((vBgCnt *)®_BG1CNT)->screenSize = 1; - ((vBgCnt *)®_BG1CNT)->areaOverflowMode = 0; - - - - DmaClear32(3, (void *)(VRAM + 0xF000), 0x1000); - LZDecompressVram(gUnknown_08D17C3C, (void *)(VRAM + 0xF000)); - - ((vBgCnt *)®_BG1CNT)->charBaseBlock = 0; - - for (i = 0; i < 4; i++) - { - gSprites[shared19338[i].unk0].oam.priority = 1; - gSprites[shared19338[i].unk1].oam.priority = 1; - } - - ((vBgCnt *)®_BG2CNT)->priority = 1; - ((vBgCnt *)®_BG0CNT)->priority = 1; - ((vBgCnt *)®_BG1CNT)->screenSize = 2; */ } -#else -NAKED -void sub_80DE224(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - sub sp, 0xC\n\ - movs r0, 0xA\n\ - bl GetGpuReg\n\ - mov r1, sp\n\ - strh r0, [r1]\n\ - mov r2, sp\n\ - ldrb r1, [r2]\n\ - movs r4, 0x4\n\ - negs r4, r4\n\ - adds r0, r4, 0\n\ - ands r0, r1\n\ - strb r0, [r2]\n\ - ldrb r1, [r2, 0x1]\n\ - movs r0, 0x3F\n\ - ands r0, r1\n\ - movs r1, 0x80\n\ - orrs r0, r1\n\ - strb r0, [r2, 0x1]\n\ - ldrb r1, [r2, 0x1]\n\ - movs r0, 0x21\n\ - negs r0, r0\n\ - ands r0, r1\n\ - strb r0, [r2, 0x1]\n\ - ldrb r1, [r2]\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - mov r8, r0\n\ - ands r0, r1\n\ - strb r0, [r2]\n\ - mov r0, sp\n\ - ldrh r1, [r0]\n\ - movs r0, 0xA\n\ - bl SetGpuReg\n\ - movs r0, 0x8\n\ - bl GetGpuReg\n\ - mov r6, sp\n\ - adds r6, 0x2\n\ - strh r0, [r6]\n\ - movs r0, 0xC\n\ - bl GetGpuReg\n\ - add r5, sp, 0x4\n\ - strh r0, [r5]\n\ - ldrb r1, [r6]\n\ - adds r0, r4, 0\n\ - ands r0, r1\n\ - movs r1, 0x1\n\ - orrs r0, r1\n\ - strb r0, [r6]\n\ - ldrb r0, [r5]\n\ - ands r4, r0\n\ - orrs r4, r1\n\ - strb r4, [r5]\n\ - ldrh r1, [r6]\n\ - movs r0, 0x8\n\ - bl SetGpuReg\n\ - ldrh r1, [r5]\n\ - movs r0, 0xC\n\ - bl SetGpuReg\n\ - ldr r1, =gBattle_BG1_X\n\ - movs r0, 0xF0\n\ - strh r0, [r1]\n\ - ldr r4, =gBattle_BG1_Y\n\ - movs r0, 0xA0\n\ - strh r0, [r4]\n\ - movs r0, 0x14\n\ - movs r1, 0xF0\n\ - bl SetGpuReg\n\ - ldrh r1, [r4]\n\ - movs r0, 0x16\n\ - bl SetGpuReg\n\ - movs r0, 0\n\ - str r0, [sp, 0x8]\n\ - add r0, sp, 0x8\n\ - ldr r4, =gContestResources\n\ - ldr r1, [r4]\n\ - ldr r1, [r1, 0x28]\n\ - ldr r2, =0x05000400\n\ - bl CpuSet\n\ - ldr r1, =gUnknown_08C17980\n\ - movs r0, 0x1\n\ - movs r2, 0\n\ - movs r3, 0\n\ - bl CopyToBgTilemapBuffer\n\ - movs r0, 0x1\n\ - bl Contest_SetBgCopyFlags\n\ - movs r5, 0\n\ - ldr r7, =gSprites\n\ - movs r6, 0x4\n\ -_080DE2F0:\n\ - ldr r0, [r4]\n\ - ldr r0, [r0, 0x14]\n\ - lsls r3, r5, 2\n\ - adds r0, r3, r0\n\ - ldrb r0, [r0]\n\ - lsls r1, r0, 4\n\ - adds r1, r0\n\ - lsls r1, 2\n\ - adds r1, r7\n\ - ldrb r2, [r1, 0x5]\n\ - mov r0, r8\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strb r0, [r1, 0x5]\n\ - ldr r0, [r4]\n\ - ldr r0, [r0, 0x14]\n\ - adds r3, r0\n\ - ldrb r0, [r3, 0x1]\n\ - lsls r1, r0, 4\n\ - adds r1, r0\n\ - lsls r1, 2\n\ - adds r1, r7\n\ - ldrb r2, [r1, 0x5]\n\ - mov r0, r8\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strb r0, [r1, 0x5]\n\ - adds r5, 0x1\n\ - cmp r5, 0x3\n\ - ble _080DE2F0\n\ - add sp, 0xC\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided\n"); -} -#endif -#ifdef NONMATCHING void sub_80DE350(void) { s32 i; - s16 var; u16 bg1Cnt; - u8 *spriteID; - u16 something; RequestDma3Fill(0,(void *)(VRAM + 0x8000), 0x2000, 0x1); - //DmaClearLarge32(3, (void *)(VRAM + 0x8000), 0x2000, 0x1000); - - /*bg1Cnt = 0; - something = 0; - var = bg1Cnt; - spriteID = (u8 *)&gContestResources;*/ - - var = 0; - - - CpuSet(&var, &gContestResources->field_24[1], 0x05000400); - //CpuSet(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) + CpuFill32(0, gContestResources->field_24[1], 0x1000); Contest_SetBgCopyFlags(1); - - //DmaClear32(3, (void *)(VRAM + 0xF000), 0x1000); - bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT); - something = bg1Cnt; - ((struct BgCnt *) &bg1Cnt)->priority = 1; - ((struct BgCnt *) &bg1Cnt)->screenSize = 1; - ((struct BgCnt *) &bg1Cnt)->areaOverflowMode = 0; - ((struct BgCnt *) &bg1Cnt)->charBaseBlock = 2; - + ((vBgCnt *) &bg1Cnt)->priority = 1; + ((vBgCnt *) &bg1Cnt)->screenSize = 0; + ((vBgCnt *) &bg1Cnt)->areaOverflowMode = 0; + ((vBgCnt *) &bg1Cnt)->charBaseBlock = 2; + SetGpuReg(REG_OFFSET_BG1CNT, bg1Cnt); gBattle_BG1_X = 0; @@ -5330,104 +4234,6 @@ void sub_80DE350(void) gSprites[gContestResources->field_14[i].unk1].oam.priority = 0; } } -#else -NAKED -void sub_80DE350(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - sub sp, 0x8\n\ - ldr r1, =0x06008000\n\ - movs r2, 0x80\n\ - lsls r2, 6\n\ - movs r0, 0\n\ - movs r3, 0x1\n\ - bl RequestDma3Fill\n\ - movs r5, 0\n\ - str r5, [sp]\n\ - ldr r6, =gContestResources\n\ - ldr r0, [r6]\n\ - ldr r1, [r0, 0x28]\n\ - ldr r2, =0x05000400\n\ - mov r0, sp\n\ - bl CpuSet\n\ - movs r0, 0x1\n\ - bl Contest_SetBgCopyFlags\n\ - movs r0, 0xA\n\ - bl GetGpuReg\n\ - add r3, sp, 0x4\n\ - strh r0, [r3]\n\ - ldrb r1, [r3]\n\ - movs r0, 0x4\n\ - negs r0, r0\n\ - ands r0, r1\n\ - movs r1, 0x1\n\ - orrs r0, r1\n\ - strb r0, [r3]\n\ - mov r1, sp\n\ - adds r1, 0x5\n\ - ldrb r2, [r1]\n\ - movs r0, 0x3F\n\ - ands r0, r2\n\ - strb r0, [r1]\n\ - ldrb r2, [r1]\n\ - movs r0, 0x21\n\ - negs r0, r0\n\ - ands r0, r2\n\ - strb r0, [r1]\n\ - ldrb r1, [r3]\n\ - movs r4, 0xD\n\ - negs r4, r4\n\ - adds r0, r4, 0\n\ - ands r0, r1\n\ - movs r1, 0x8\n\ - orrs r0, r1\n\ - strb r0, [r3]\n\ - ldrh r1, [r3]\n\ - movs r0, 0xA\n\ - bl SetGpuReg\n\ - ldr r0, =gBattle_BG1_X\n\ - strh r5, [r0]\n\ - ldr r0, =gBattle_BG1_Y\n\ - strh r5, [r0]\n\ - ldr r7, =gSprites\n\ -_080DE3CA:\n\ - ldr r0, [r6]\n\ - ldr r0, [r0, 0x14]\n\ - lsls r3, r5, 2\n\ - adds r0, r3, r0\n\ - ldrb r0, [r0]\n\ - lsls r1, r0, 4\n\ - adds r1, r0\n\ - lsls r1, 2\n\ - adds r1, r7\n\ - ldrb r2, [r1, 0x5]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - strb r0, [r1, 0x5]\n\ - ldr r0, [r6]\n\ - ldr r0, [r0, 0x14]\n\ - adds r3, r0\n\ - ldrb r0, [r3, 0x1]\n\ - lsls r1, r0, 4\n\ - adds r1, r0\n\ - lsls r1, 2\n\ - adds r1, r7\n\ - ldrb r2, [r1, 0x5]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - strb r0, [r1, 0x5]\n\ - adds r5, 0x1\n\ - cmp r5, 0x3\n\ - ble _080DE3CA\n\ - add sp, 0x8\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided\n"); -} -#endif void sub_80DE424(u8 taskId) { @@ -5704,7 +4510,6 @@ void SelectContestMoveBankTarget(u16 move) } } -#ifdef NONMATCHING void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b) { struct TextPrinterTemplate printerTemplate; @@ -5718,158 +4523,46 @@ void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b) printerTemplate.currentY = 1; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - - printerTemplate.unk = a & (1 - 0x11); - printerTemplate.unk = 0xF0; - printerTemplate.bgColor = a & (1 - 0x11) & 0x80; - - - - + printerTemplate.unk = 0; + printerTemplate.fgColor = 15; + printerTemplate.bgColor = 0; + printerTemplate.shadowColor = 8; + AddTextPrinter(&printerTemplate, 0, 0); PutWindowTilemap(a); Contest_SetBgCopyFlags(0); } -#else -NAKED -void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b) -{ - asm(".syntax unified\n\ - push {r4,lr}\n\ - sub sp, 0x10\n\ - adds r4, r0, 0\n\ - str r1, [sp]\n\ - mov r0, sp\n\ - movs r2, 0\n\ - strb r4, [r0, 0x4]\n\ - movs r1, 0x1\n\ - strb r1, [r0, 0x5]\n\ - strb r2, [r0, 0x6]\n\ - strb r1, [r0, 0x7]\n\ - strb r2, [r0, 0x8]\n\ - strb r1, [r0, 0x9]\n\ - strb r2, [r0, 0xA]\n\ - strb r2, [r0, 0xB]\n\ - mov r3, sp\n\ - ldrb r2, [r3, 0xC]\n\ - subs r1, 0x11\n\ - adds r0, r1, 0\n\ - ands r0, r2\n\ - strb r0, [r3, 0xC]\n\ - mov r2, sp\n\ - movs r0, 0xF0\n\ - strb r0, [r2, 0xC]\n\ - ldrb r0, [r2, 0xD]\n\ - ands r1, r0\n\ - strb r1, [r2, 0xD]\n\ - mov r1, sp\n\ - movs r0, 0x80\n\ - strb r0, [r1, 0xD]\n\ - mov r0, sp\n\ - movs r1, 0\n\ - movs r2, 0\n\ - bl AddTextPrinter\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - adds r0, r4, 0\n\ - bl PutWindowTilemap\n\ - movs r0, 0\n\ - bl Contest_SetBgCopyFlags\n\ - add sp, 0x10\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif -#ifdef NONMATCHING -void Contest_PrintTextToBg0WindowAt(u32 a, u8 *b, s32 c, u8 d, u8 e) +void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s32 fontId) { struct TextPrinterTemplate printerTemplate; - printerTemplate.currentChar = b; - printerTemplate.windowId = a; - printerTemplate.fontId = 1; - printerTemplate.x = c; - printerTemplate.y = d; - printerTemplate.currentX = c; - printerTemplate.currentY = d; + printerTemplate.currentChar = currChar; + printerTemplate.windowId = windowId; + printerTemplate.fontId = fontId; + printerTemplate.x = x; + printerTemplate.y = y; + printerTemplate.currentX = x; + printerTemplate.currentY = y; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - - printerTemplate.unk = a & (1 - 0x10); - printerTemplate.unk = 0xF0; - printerTemplate.bgColor = a & (1 - 0x11) & 0x80; - - - - + printerTemplate.unk = 0; + printerTemplate.fgColor = 15; + printerTemplate.bgColor = 0; + printerTemplate.shadowColor = 8; + AddTextPrinter(&printerTemplate, 0, 0); - PutWindowTilemap(a); + PutWindowTilemap(windowId); Contest_SetBgCopyFlags(0); } -#else -NAKED -void Contest_PrintTextToBg0WindowAt(u32 a, u8 *b, s32 c, u8 d, u8 e) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - sub sp, 0x10\n\ - adds r5, r0, 0\n\ - ldr r4, [sp, 0x1C]\n\ - str r1, [sp]\n\ - mov r0, sp\n\ - movs r1, 0\n\ - strb r5, [r0, 0x4]\n\ - strb r4, [r0, 0x5]\n\ - strb r2, [r0, 0x6]\n\ - strb r3, [r0, 0x7]\n\ - strb r2, [r0, 0x8]\n\ - strb r3, [r0, 0x9]\n\ - strb r1, [r0, 0xA]\n\ - strb r1, [r0, 0xB]\n\ - mov r3, sp\n\ - ldrb r2, [r3, 0xC]\n\ - subs r1, 0x10\n\ - adds r0, r1, 0\n\ - ands r0, r2\n\ - strb r0, [r3, 0xC]\n\ - mov r2, sp\n\ - movs r0, 0xF0\n\ - strb r0, [r2, 0xC]\n\ - ldrb r0, [r2, 0xD]\n\ - ands r1, r0\n\ - strb r1, [r2, 0xD]\n\ - mov r1, sp\n\ - movs r0, 0x80\n\ - strb r0, [r1, 0xD]\n\ - mov r0, sp\n\ - movs r1, 0\n\ - movs r2, 0\n\ - bl AddTextPrinter\n\ - lsls r5, 24\n\ - lsrs r5, 24\n\ - adds r0, r5, 0\n\ - bl PutWindowTilemap\n\ - movs r0, 0\n\ - bl Contest_SetBgCopyFlags\n\ - add sp, 0x10\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif -#ifdef NONMATCHING -void Contest_StartTextPrinter(const u8 *a, u32 b) +void Contest_StartTextPrinter(const u8 *currChar, bool32 b) { struct TextPrinterTemplate printerTemplate; - u8 var; + u8 speed; - printerTemplate.currentChar = a; - printerTemplate.windowId = b; + printerTemplate.currentChar = currChar; + printerTemplate.windowId = 4; printerTemplate.fontId = 1; printerTemplate.x = 0; printerTemplate.y = 1; @@ -5877,166 +4570,33 @@ void Contest_StartTextPrinter(const u8 *a, u32 b) printerTemplate.currentY = 1; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - - printerTemplate.unk = b & -0x10; - printerTemplate.unk = 0x10; - printerTemplate.bgColor = b & (1 - 0x10) & 0x80; - - if(!b) + printerTemplate.unk = 0; + printerTemplate.fgColor = 1; + printerTemplate.bgColor = 0; + printerTemplate.shadowColor = 8; + + if (!b) { - var = 0; - AddTextPrinter(&printerTemplate, var, 0); + AddTextPrinter(&printerTemplate, 0, 0); } - else - { - if(gIsLinkContest & 1) - { - var = 4; - AddTextPrinter(&printerTemplate, var, 0); - } + else + { + if (gIsLinkContest & 1) + speed = 4; else - { - var = GetPlayerTextSpeedDelay(); - AddTextPrinter(&printerTemplate, var, 0); - } + speed = GetPlayerTextSpeedDelay(); + AddTextPrinter(&printerTemplate, speed, 0); } - + PutWindowTilemap(4); Contest_SetBgCopyFlags(0); - } -} -#else -NAKED -void Contest_StartTextPrinter(const u8 *a, u32 b) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - sub sp, 0x10\n\ - str r0, [sp]\n\ - mov r2, sp\n\ - movs r3, 0\n\ - movs r0, 0x4\n\ - strb r0, [r2, 0x4]\n\ - mov r0, sp\n\ - movs r5, 0x1\n\ - strb r5, [r0, 0x5]\n\ - strb r3, [r0, 0x6]\n\ - strb r5, [r0, 0x7]\n\ - strb r3, [r0, 0x8]\n\ - strb r5, [r0, 0x9]\n\ - strb r3, [r0, 0xA]\n\ - strb r3, [r0, 0xB]\n\ - mov r4, sp\n\ - ldrb r3, [r4, 0xC]\n\ - movs r2, 0x10\n\ - negs r2, r2\n\ - adds r0, r2, 0\n\ - ands r0, r3\n\ - strb r0, [r4, 0xC]\n\ - mov r3, sp\n\ - movs r0, 0x10\n\ - strb r0, [r3, 0xC]\n\ - ldrb r0, [r3, 0xD]\n\ - ands r2, r0\n\ - strb r2, [r3, 0xD]\n\ - mov r2, sp\n\ - movs r0, 0x80\n\ - strb r0, [r2, 0xD]\n\ - cmp r1, 0\n\ - bne _080DEC80\n\ - mov r0, sp\n\ - movs r1, 0\n\ - movs r2, 0\n\ - bl AddTextPrinter\n\ - b _080DECA4\n\ -_080DEC80:\n\ - ldr r0, =gIsLinkContest\n\ - ldrb r1, [r0]\n\ - adds r0, r5, 0\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DEC94\n\ - movs r1, 0x4\n\ - b _080DEC9C\n\ - .pool\n\ -_080DEC94:\n\ - bl GetPlayerTextSpeedDelay\n\ - lsls r0, 24\n\ - lsrs r1, r0, 24\n\ -_080DEC9C:\n\ - mov r0, sp\n\ - movs r2, 0\n\ - bl AddTextPrinter\n\ -_080DECA4:\n\ - movs r0, 0x4\n\ - bl PutWindowTilemap\n\ - movs r0, 0\n\ - bl Contest_SetBgCopyFlags\n\ - add sp, 0x10\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif -#ifdef NONMATCHING -void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, u8 h) +void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, s16 h) { - s16 var = h; - WriteSequenceToBgTilemapBuffer(a, b, c, d, e, f, g, var); + WriteSequenceToBgTilemapBuffer(a, b, c, d, e, f, g, h); Contest_SetBgCopyFlags(a); } -#else -NAKED -void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, u8 h) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - sub sp, 0x10\n\ - mov r8, r0\n\ - ldr r0, [sp, 0x28]\n\ - ldr r4, [sp, 0x2C]\n\ - ldr r5, [sp, 0x30]\n\ - ldr r6, [sp, 0x34]\n\ - mov r7, r8\n\ - lsls r7, 24\n\ - lsrs r7, 24\n\ - mov r8, r7\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - lsls r3, 24\n\ - lsrs r3, 24\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - lsls r5, 24\n\ - lsrs r5, 24\n\ - str r0, [sp]\n\ - str r4, [sp, 0x4]\n\ - str r5, [sp, 0x8]\n\ - lsls r6, 16\n\ - asrs r6, 16\n\ - str r6, [sp, 0xC]\n\ - mov r0, r8\n\ - bl WriteSequenceToBgTilemapBuffer\n\ - mov r0, r8\n\ - bl Contest_SetBgCopyFlags\n\ - add sp, 0x10\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif void ContestBG_FillBoxWithTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g) { @@ -6058,8 +4618,8 @@ void ResetContestLinkResults(void) { s32 i; s32 j; - - for(i = 0; i < 5; i++) + + for(i = 0; i < 5; i++) for(j = 0; j < 4; j++) gSaveBlock2Ptr->contestLinkResults[i][j] = 0; } @@ -6107,7 +4667,7 @@ bool8 sub_80DEDA8(u8 a) gSaveBlock1Ptr->contestWinners[r4].contestRank = 4; else gSaveBlock1Ptr->contestWinners[r4].contestRank = gSpecialVar_ContestRank; - + if (a != 0xFF) gSaveBlock1Ptr->contestWinners[r4].contestCategory = gSpecialVar_ContestCategory; else @@ -6165,4 +4725,4 @@ void ClearContestWinnerPicsInContestHall(void) for (i = 0; i < 8; i++) gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i]; -} \ No newline at end of file +} From ad59811154093d63343528cccf59a5746dcca934 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 28 Jan 2019 18:13:07 +0100 Subject: [PATCH 10/42] Decompile whole contest --- asm/contest.s | 1324 --------------------------------------------- include/contest.h | 108 ++-- include/text.h | 5 + include/tv.h | 5 + ld_script.txt | 1 - src/contest.c | 1124 ++++++++++++++++++++++++++------------ 6 files changed, 860 insertions(+), 1707 deletions(-) delete mode 100644 asm/contest.s diff --git a/asm/contest.s b/asm/contest.s deleted file mode 100644 index f30eb32613..0000000000 --- a/asm/contest.s +++ /dev/null @@ -1,1324 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80DF080 -sub_80DF080: @ 80DF080 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r2, =gContestResources - ldr r3, [r2] - ldr r5, [r3, 0x10] - ldrb r1, [r5, 0x1] - movs r7, 0x1 - adds r0, r7, 0 - ands r0, r1 - adds r6, r2, 0 - cmp r0, 0 - bne _080DF0D2 - movs r0, 0 - ldrsb r0, [r5, r0] - cmp r0, 0 - ble _080DF0D2 - ldr r1, [r3, 0x4] - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x15] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - bne _080DF0D2 - ldr r1, [r3, 0x1C] - lsls r2, r4, 4 - adds r1, r2, r1 - ldrb r3, [r1, 0xC] - movs r0, 0x1 - orrs r0, r3 - strb r0, [r1, 0xC] - ldr r0, [r6] - ldr r0, [r0, 0x1C] - adds r2, r0 - ldrb r0, [r2, 0xE] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0xE] -_080DF0D2: - ldr r3, [r6] - ldr r1, [r3, 0x4] - lsls r2, r4, 3 - subs r0, r2, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0xC] - movs r5, 0x1 - adds r0, r5, 0 - ands r0, r1 - adds r7, r2, 0 - cmp r0, 0 - beq _080DF0FA - ldr r0, [r3, 0x1C] - lsls r1, r4, 4 - adds r1, r0 - ldrb r2, [r1, 0xC] - movs r0, 0x2 - orrs r0, r2 - strb r0, [r1, 0xC] -_080DF0FA: - ldr r3, [r6] - ldr r2, [r3, 0x10] - ldrb r1, [r2, 0x1] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - bne _080DF126 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0 - beq _080DF126 - movs r0, 0x2 - ldrsb r0, [r2, r0] - cmp r0, 0x3C - bne _080DF126 - ldr r0, [r3, 0x1C] - lsls r1, r4, 4 - adds r1, r0 - ldrb r2, [r1, 0xC] - movs r0, 0x4 - orrs r0, r2 - strb r0, [r1, 0xC] -_080DF126: - ldr r3, [r6] - ldr r1, [r3, 0x4] - subs r0, r7, r4 - lsls r0, 2 - adds r2, r0, r1 - ldrb r1, [r2, 0x15] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _080DF14E - ldrb r0, [r2, 0x16] - cmp r0, 0 - beq _080DF14E - ldr r0, [r3, 0x1C] - lsls r1, r4, 4 - adds r1, r0 - ldrb r2, [r1, 0xC] - movs r0, 0x8 - orrs r0, r2 - strb r0, [r1, 0xC] -_080DF14E: - movs r3, 0 - movs r5, 0 -_080DF152: - cmp r3, r4 - beq _080DF180 - ldr r1, [r6] - ldr r0, [r1, 0x4] - adds r0, r5, r0 - ldrb r0, [r0, 0xE] - cmp r0, 0 - beq _080DF180 - ldr r0, [r1, 0x1C] - lsls r2, r4, 4 - adds r2, r0 - ldrb r0, [r2, 0xC] - movs r1, 0x10 - orrs r0, r1 - strb r0, [r2, 0xC] - ldr r0, [r6] - ldr r0, [r0, 0x1C] - lsls r2, r3, 4 - adds r2, r0 - ldrb r0, [r2, 0xC] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r2, 0xC] -_080DF180: - adds r5, 0x1C - adds r3, 0x1 - cmp r3, 0x3 - ble _080DF152 - ldr r2, [r6] - ldr r1, [r2, 0x4] - subs r0, r7, r4 - lsls r5, r0, 2 - adds r1, r5, r1 - ldrb r3, [r1, 0xC] - movs r0, 0x6 - ands r0, r3 - cmp r0, 0 - bne _080DF1A6 - ldrb r1, [r1, 0xB] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080DF1BC -_080DF1A6: - ldr r0, [r2, 0x1C] - lsls r1, r4, 4 - adds r1, r0 - ldrb r2, [r1, 0xC] - movs r0, 0x20 - orrs r0, r2 - strb r0, [r1, 0xC] - b _080DF1F6 - .pool -_080DF1BC: - movs r0, 0x1 - ands r0, r3 - cmp r0, 0 - bne _080DF1F6 - ldr r2, [r2, 0x1C] - lsls r3, r4, 4 - adds r2, r3, r2 - ldrb r0, [r2, 0xC] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0xC] - ldr r0, [r6] - ldr r1, [r0, 0x1C] - adds r1, r3, r1 - ldrb r0, [r1, 0xE] - movs r2, 0x1 - orrs r0, r2 - strb r0, [r1, 0xE] - ldr r1, [r6] - ldr r0, [r1, 0x1C] - adds r3, r0 - ldr r0, [r1] - ldrb r0, [r0, 0x1] - lsls r0, 1 - adds r3, r0 - ldr r0, [r1, 0x4] - adds r0, r5, r0 - ldrh r0, [r0, 0x6] - strh r0, [r3] -_080DF1F6: - ldr r2, [r6] - ldr r1, [r2, 0x4] - subs r0, r7, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x15] - movs r5, 0x1 - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - beq _080DF21A - ldr r0, [r2, 0x1C] - lsls r1, r4, 4 - adds r1, r0 - ldrb r2, [r1, 0xD] - movs r0, 0x2 - orrs r0, r2 - strb r0, [r1, 0xD] -_080DF21A: - ldr r2, [r6] - ldr r0, [r2] - ldrb r0, [r0, 0x13] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - bne _080DF24A - ldr r3, [r2, 0x10] - ldrb r1, [r3, 0x1] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - bne _080DF24A - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r0, 0 - bge _080DF24A - ldr r0, [r2, 0x1C] - lsls r1, r4, 4 - adds r1, r0 - ldrb r2, [r1, 0xD] - movs r0, 0x20 - orrs r0, r2 - strb r0, [r1, 0xD] -_080DF24A: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80DF080 - - thumb_func_start sub_80DF250 -sub_80DF250: @ 80DF250 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x38 - movs r1, 0 - movs r0, 0 - str r0, [sp, 0x20] - movs r4, 0 - ldr r6, =gContestResources - mov r2, sp - adds r2, 0xC - str r2, [sp, 0x28] - mov r3, sp - adds r3, 0x14 - str r3, [sp, 0x2C] - mov r7, sp - adds r7, 0x2 - str r7, [sp, 0x24] - ldr r5, =gContestFinalStandings - movs r2, 0 - movs r3, 0x80 - lsls r3, 17 -_080DF280: - adds r0, r4, r5 - ldrb r0, [r0] - cmp r0, 0 - bne _080DF298 - lsrs r0, r2, 24 - str r0, [sp, 0x20] - b _080DF29E - .pool -_080DF298: - cmp r0, 0x3 - bne _080DF29E - lsrs r1, r2, 24 -_080DF29E: - adds r2, r3 - adds r4, 0x1 - cmp r4, 0x3 - ble _080DF280 - ldr r0, [r6] - ldr r0, [r0, 0x1C] - lsls r1, 4 - adds r1, r0 - ldrb r2, [r1, 0xD] - movs r0, 0x1 - orrs r0, r2 - strb r0, [r1, 0xD] - movs r4, 0 - ldr r1, [sp, 0x20] - lsls r1, 4 - str r1, [sp, 0x30] - mov r9, r4 - mov r10, r4 -_080DF2C2: - ldr r2, [sp, 0x20] - cmp r4, r2 - beq _080DF2EE - ldr r1, =gUnknown_02039F08 - lsls r0, r2, 1 - adds r0, r1 - movs r3, 0 - ldrsh r2, [r0, r3] - add r1, r10 - movs r6, 0 - ldrsh r0, [r1, r6] - subs r2, r0 - cmp r2, 0x32 - bgt _080DF2EE - ldr r7, =gContestResources - ldr r0, [r7] - ldr r2, [r0, 0x1C] - add r2, r9 - ldrb r0, [r2, 0xD] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2, 0xD] -_080DF2EE: - ldr r1, =gContestResources - ldr r0, [r1] - ldr r0, [r0, 0x1C] - mov r3, r9 - adds r2, r3, r0 - ldrb r1, [r2, 0xE] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _080DF30A - ldrb r0, [r2, 0xD] - movs r1, 0x8 - orrs r0, r1 - strb r0, [r2, 0xD] -_080DF30A: - movs r5, 0 - ldr r2, =gContestMonConditions - add r2, r10 - movs r6, 0 - ldrsh r1, [r2, r6] - ldr r7, =gContestMonConditions - movs r3, 0 - ldrsh r0, [r7, r3] - cmp r1, r0 - blt _080DF336 - adds r3, r2, 0 - adds r2, r7, 0 -_080DF322: - adds r2, 0x2 - adds r5, 0x1 - cmp r5, 0x3 - bgt _080DF336 - movs r6, 0 - ldrsh r1, [r3, r6] - movs r7, 0 - ldrsh r0, [r2, r7] - cmp r1, r0 - bge _080DF322 -_080DF336: - cmp r5, 0x4 - bne _080DF354 - ldr r1, =gContestFinalStandings - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080DF354 - ldr r2, =gContestResources - ldr r0, [r2] - ldr r2, [r0, 0x1C] - add r2, r9 - ldrb r0, [r2, 0xD] - movs r1, 0x10 - orrs r0, r1 - strb r0, [r2, 0xD] -_080DF354: - movs r3, 0 - mov r12, r3 - mov r8, r3 - movs r5, 0 - ldr r0, =gContestMonConditions - add r0, r10 - movs r7, 0 - ldrsh r6, [r0, r7] - str r6, [sp, 0x34] - ldr r2, =gContestMonConditions - ldr r0, =gUnknown_02039F18 - mov r1, r10 - adds r6, r1, r0 - adds r3, r0, 0 -_080DF370: - movs r7, 0 - ldrsh r0, [r2, r7] - ldr r1, [sp, 0x34] - cmp r1, r0 - ble _080DF37E - movs r7, 0x1 - mov r12, r7 -_080DF37E: - movs r0, 0 - ldrsh r1, [r6, r0] - movs r7, 0 - ldrsh r0, [r3, r7] - cmp r1, r0 - ble _080DF38E - movs r0, 0x1 - mov r8, r0 -_080DF38E: - adds r2, 0x2 - adds r3, 0x2 - adds r5, 0x1 - cmp r5, 0x3 - ble _080DF370 - mov r1, r12 - cmp r1, 0 - bne _080DF3B4 - mov r2, r8 - cmp r2, 0 - bne _080DF3B4 - ldr r3, =gContestResources - ldr r0, [r3] - ldr r2, [r0, 0x1C] - add r2, r9 - ldrb r0, [r2, 0xD] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r2, 0xD] -_080DF3B4: - ldr r6, =gContestResources - ldr r0, [r6] - ldr r0, [r0, 0x1C] - mov r7, r9 - adds r2, r7, r0 - ldrb r1, [r2, 0xE] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080DF3D0 - ldrb r0, [r2, 0xD] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0xD] -_080DF3D0: - movs r0, 0x10 - add r9, r0 - movs r1, 0x2 - add r10, r1 - adds r4, 0x1 - cmp r4, 0x3 - bgt _080DF3E0 - b _080DF2C2 -_080DF3E0: - movs r4, 0 - movs r5, 0 - movs r3, 0 - ldr r2, [sp, 0x28] - mov r1, sp -_080DF3EA: - strh r3, [r1] - adds r0, r2, r4 - strb r5, [r0] - adds r1, 0x2 - adds r4, 0x1 - cmp r4, 0x4 - ble _080DF3EA - mov r1, sp - ldr r0, =0x0000ffff - strh r0, [r1, 0xA] - movs r0, 0 - ldr r2, [sp, 0x28] - strb r0, [r2, 0x5] - movs r4, 0 - ldr r0, =gContestResources - ldr r0, [r0] - mov r8, r0 - ldr r7, [sp, 0x30] -_080DF40E: - mov r3, r8 - ldr r0, [r3, 0x1C] - adds r0, r7, r0 - lsls r1, r4, 1 - adds r0, r1 - ldrh r0, [r0] - adds r4, 0x1 - mov r12, r4 - cmp r0, 0 - beq _080DF450 - ldr r0, =gContestResources - ldr r6, [r0] - ldr r3, [sp, 0x28] - mov r4, sp - movs r5, 0x4 -_080DF42C: - ldr r0, [r6, 0x1C] - adds r0, r7, r0 - adds r0, r1 - ldrh r0, [r0] - ldrh r2, [r4] - cmp r0, r2 - beq _080DF440 - cmp r2, 0 - bne _080DF446 - strh r0, [r4] -_080DF440: - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] -_080DF446: - adds r3, 0x1 - adds r4, 0x2 - subs r5, 0x1 - cmp r5, 0 - bge _080DF42C -_080DF450: - mov r4, r12 - cmp r4, 0x4 - ble _080DF40E - mov r0, sp - ldrh r0, [r0] - ldr r6, [sp, 0x2C] - strh r0, [r6] - ldr r7, [sp, 0x28] - ldrb r3, [r7] - movs r6, 0 - movs r4, 0x1 - ldr r1, [sp, 0x24] - ldrh r0, [r1] - ldr r1, =0x0000ffff - cmp r0, r1 - beq _080DF4C0 - ldr r5, [sp, 0x2C] - adds r7, r1, 0 - mov r2, sp - adds r2, 0x2 -_080DF478: - ldr r0, [sp, 0x28] - adds r1, r0, r4 - ldrb r0, [r1] - cmp r3, r0 - bcs _080DF4A4 - ldrh r0, [r2] - strh r0, [r5] - ldrb r3, [r1] - movs r6, 0x1 - b _080DF4B6 - .pool -_080DF4A4: - cmp r3, r0 - bne _080DF4B6 - lsls r0, r6, 1 - adds r0, r5, r0 - ldrh r1, [r2] - strh r1, [r0] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 -_080DF4B6: - adds r2, 0x2 - adds r4, 0x1 - ldrh r0, [r2] - cmp r0, r7 - bne _080DF478 -_080DF4C0: - bl Random - ldr r1, =gContestResources - ldr r1, [r1] - ldr r4, [r1, 0x1C] - ldr r1, [sp, 0x30] - adds r4, r1, r4 - lsls r0, 16 - lsrs r0, 16 - adds r1, r6, 0 - bl __modsi3 - lsls r0, 1 - ldr r2, [sp, 0x2C] - adds r0, r2, r0 - ldrh r0, [r0] - strh r0, [r4, 0xA] - add sp, 0x38 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DF250 - - thumb_func_start sub_80DF4F8 -sub_80DF4F8: @ 80DF4F8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - ldr r1, =gContestFinalStandings - ldr r0, =gContestPlayerMonIndex - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080DF514 - b _080DF6EE -_080DF514: - movs r7, 0 - movs r3, 0 - ldr r0, =gContestResources - mov r12, r0 -_080DF51C: - adds r0, r3, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080DF528 - lsls r0, r3, 24 - lsrs r7, r0, 24 -_080DF528: - adds r3, 0x1 - cmp r3, 0x3 - ble _080DF51C - movs r1, 0 - mov r9, r1 - mov r10, r1 - movs r3, 0 - lsls r2, r7, 1 - lsls r4, r7, 4 - mov r8, r4 - ldr r1, =gContestMonConditions - adds r0, r2, r1 - movs r6, 0 - ldrsh r5, [r0, r6] - str r5, [sp, 0x8] - adds r5, r1, 0 - ldr r0, =gUnknown_02039F18 - adds r2, r0 - adds r4, r0, 0 -_080DF54E: - movs r1, 0 - ldrsh r0, [r5, r1] - ldr r6, [sp, 0x8] - cmp r6, r0 - bge _080DF562 - mov r0, r9 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 -_080DF562: - movs r0, 0 - ldrsh r1, [r2, r0] - movs r6, 0 - ldrsh r0, [r4, r6] - cmp r1, r0 - bge _080DF578 - mov r0, r10 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 -_080DF578: - adds r5, 0x2 - adds r4, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080DF54E - mov r1, r12 - ldr r0, [r1] - ldr r0, [r0, 0x1C] - add r0, r8 - ldrb r1, [r0, 0xC] - movs r4, 0 - movs r2, 0x1 - movs r3, 0x7 -_080DF592: - adds r0, r1, 0 - ands r0, r2 - cmp r0, 0 - beq _080DF5A0 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_080DF5A0: - lsrs r1, 1 - subs r3, 0x1 - cmp r3, 0 - bge _080DF592 - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r4, 0 - bl __modsi3 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0, 0x1C] - add r0, r8 - ldrb r1, [r0, 0xC] - movs r4, 0 - movs r2, 0 - movs r3, 0 - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080DF5DC - cmp r5, 0 - beq _080DF5F6 -_080DF5D6: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_080DF5DC: - lsrs r1, 1 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - adds r3, 0x1 - cmp r3, 0x7 - bgt _080DF5F6 - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080DF5DC - cmp r5, r4 - bne _080DF5D6 -_080DF5F6: - movs r1, 0x1 - adds r0, r1, 0 - lsls r0, r2 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r7, 0 - bne _080DF628 - mov r0, sp - strb r1, [r0] - ldr r1, =gContestResources - ldr r0, [r1] - ldr r0, [r0, 0x1C] - ldrb r4, [r0, 0x1D] - movs r3, 0x2 - b _080DF638 - .pool -_080DF628: - mov r1, sp - movs r0, 0 - strb r0, [r1] - ldr r1, =gContestResources - ldr r0, [r1] - ldr r0, [r0, 0x1C] - ldrb r4, [r0, 0xD] - movs r3, 0x1 -_080DF638: - mov r12, r1 - movs r5, 0x1 - lsls r2, 24 - str r2, [sp, 0x4] - cmp r3, 0x3 - bgt _080DF682 -_080DF644: - cmp r3, r7 - beq _080DF67C - mov r6, r12 - ldr r2, [r6] - ldr r0, [r2, 0x1C] - lsls r1, r3, 4 - adds r0, r1, r0 - ldrb r0, [r0, 0xD] - cmp r4, r0 - bcs _080DF66C - mov r0, sp - strb r3, [r0] - ldr r0, [r2, 0x1C] - adds r0, r1, r0 - ldrb r4, [r0, 0xD] - movs r5, 0x1 - b _080DF67C - .pool -_080DF66C: - cmp r4, r0 - bne _080DF67C - mov r1, sp - adds r0, r1, r5 - strb r3, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_080DF67C: - adds r3, 0x1 - cmp r3, 0x3 - ble _080DF644 -_080DF682: - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r5, 0 - bl __modsi3 - add r0, sp - ldrb r6, [r0] - movs r2, 0x80 - movs r3, 0 - ldr r5, =gContestResources - ldr r0, [r5] - ldr r0, [r0, 0x1C] - lsls r1, r6, 4 - adds r0, r1, r0 - ldrb r0, [r0, 0xD] - ands r0, r2 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _080DF6C4 -_080DF6AE: - lsrs r2, 1 - adds r3, 0x1 - cmp r3, 0x7 - bgt _080DF6C4 - ldr r0, [r5] - ldr r0, [r0, 0x1C] - adds r0, r1, r0 - ldrb r4, [r0, 0xD] - ands r4, r2 - cmp r4, 0 - beq _080DF6AE -_080DF6C4: - mov r0, r9 - bl ContestLiveUpdates_BeforeInterview_1 - mov r0, r10 - bl ContestLiveUpdates_BeforeInterview_2 - ldr r5, [sp, 0x4] - lsrs r0, r5, 24 - bl ContestLiveUpdates_BeforeInterview_3 - ldr r0, =gContestResources - ldr r0, [r0] - ldr r0, [r0, 0x1C] - add r0, r8 - ldrh r0, [r0, 0xA] - bl ContestLiveUpdates_BeforeInterview_4 - adds r0, r4, 0 - adds r1, r6, 0 - bl ContestLiveUpdates_BeforeInterview_5 -_080DF6EE: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DF4F8 - - thumb_func_start sub_80DF704 -sub_80DF704: @ 80DF704 - push {r4,lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, =gHeap - movs r1, 0xD0 - lsls r1, 9 - adds r2, r0, r1 - ldrb r1, [r2] - adds r4, r0, 0 - cmp r1, 0 - bne _080DF72C - cmp r3, 0 - bne _080DF728 - movs r0, 0x2 - b _080DF72E - .pool -_080DF728: - movs r0, 0x3 - b _080DF72E -_080DF72C: - movs r0, 0 -_080DF72E: - strb r0, [r2] - movs r1, 0xD0 - lsls r1, 9 - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080DF746 - bl sub_80DAEA4 - bl sub_80DB2BC - b _080DF74A -_080DF746: - bl sub_80DF750 -_080DF74A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DF704 - - thumb_func_start sub_80DF750 -sub_80DF750: @ 80DF750 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x34 - ldr r0, =gUnknown_020322D5 - ldrb r0, [r0] - cmp r0, 0 - bne _080DF766 - b _080DF924 -_080DF766: - ldr r0, =gHeap - movs r1, 0xD0 - lsls r1, 9 - adds r0, r1 - ldrb r0, [r0] - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _080DF77C - b _080DF924 -_080DF77C: - movs r7, 0 - mov r2, sp - adds r2, 0x18 - str r2, [sp, 0x30] -_080DF784: - adds r0, r7, 0 - movs r1, 0 - bl FillWindowPixelBuffer - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x3 - bls _080DF784 - ldr r0, =gHeap - movs r1, 0xD0 - lsls r1, 9 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x2 - bne _080DF874 - movs r7, 0 - movs r2, 0x7 - mov r10, r2 - ldr r0, [sp, 0x30] - mov r9, r0 -_080DF7AE: - add r0, sp, 0x4 - ldr r1, =gText_CDot - bl StringCopy - adds r5, r0, 0 - ldr r0, =gUnknown_02039F26 - adds r0, r7, r0 - ldrb r0, [r0] - mov r1, r10 - str r1, [sp] - add r1, sp, 0x4 - movs r2, 0x5 - movs r3, 0x1 - bl Contest_PrintTextToBg0WindowAt - ldr r0, =gContestResources - ldr r0, [r0] - ldr r1, [r0, 0x1C] - lsls r0, r7, 4 - adds r0, r1 - ldrb r4, [r0, 0xC] - movs r6, 0x7 - adds r2, r7, 0x1 - mov r8, r2 -_080DF7DE: - movs r1, 0x1 - ands r1, r4 - adds r0, r5, 0 - movs r2, 0 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - adds r5, r0, 0 - lsrs r4, 1 - lsls r0, r6, 24 - movs r1, 0xFF - lsls r1, 24 - adds r0, r1 - lsrs r6, r0, 24 - asrs r0, 24 - movs r2, 0x1 - negs r2, r2 - cmp r0, r2 - bgt _080DF7DE - movs r6, 0 - ldr r4, =gUnknown_02039F26 - ldr r3, [sp, 0x30] -_080DF80A: - lsls r0, r6, 24 - asrs r0, 24 - adds r2, r3, r0 - mov r1, sp - adds r1, r0 - adds r1, 0x4 - ldrb r1, [r1] - strb r1, [r2] - adds r0, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - asrs r5, r0, 24 - cmp r5, 0x4 - ble _080DF80A - mov r0, r9 - adds r1, r0, r5 - movs r0, 0xFF - strb r0, [r1] - adds r4, r7, r4 - ldrb r0, [r4] - mov r1, r10 - str r1, [sp] - mov r1, r9 - movs r2, 0x5 - movs r3, 0x1 - bl Contest_PrintTextToBg0WindowAt - ldrb r0, [r4] - mov r1, sp - adds r1, r5 - adds r1, 0x4 - mov r2, r10 - str r2, [sp] - movs r2, 0x37 - movs r3, 0x1 - bl Contest_PrintTextToBg0WindowAt - mov r1, r8 - lsls r0, r1, 24 - lsrs r7, r0, 24 - cmp r7, 0x3 - bls _080DF7AE - b _080DF920 - .pool -_080DF874: - movs r7, 0 - mov r2, sp - adds r2, 0x6 - str r2, [sp, 0x2C] - ldr r0, [sp, 0x30] - mov r9, r0 - movs r1, 0x7 - mov r10, r1 -_080DF884: - add r0, sp, 0x4 - ldr r1, =gText_BDot - bl StringCopy - ldr r0, =gContestResources - ldr r0, [r0] - ldr r1, [r0, 0x1C] - lsls r0, r7, 4 - adds r0, r1 - ldrb r4, [r0, 0xD] - ldr r5, [sp, 0x2C] - movs r6, 0x7 - adds r2, r7, 0x1 - mov r8, r2 -_080DF8A0: - movs r1, 0x1 - ands r1, r4 - adds r0, r5, 0 - movs r2, 0 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - adds r5, r0, 0 - lsrs r4, 1 - lsls r0, r6, 24 - movs r1, 0xFF - lsls r1, 24 - adds r0, r1 - lsrs r6, r0, 24 - asrs r0, 24 - movs r2, 0x1 - negs r2, r2 - cmp r0, r2 - bgt _080DF8A0 - movs r6, 0 - ldr r4, =gUnknown_02039F26 - ldr r3, [sp, 0x30] -_080DF8CC: - lsls r0, r6, 24 - asrs r0, 24 - adds r2, r3, r0 - mov r1, sp - adds r1, r0 - adds r1, 0x4 - ldrb r1, [r1] - strb r1, [r2] - adds r0, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - asrs r5, r0, 24 - cmp r5, 0x4 - ble _080DF8CC - mov r0, r9 - adds r1, r0, r5 - movs r0, 0xFF - strb r0, [r1] - adds r4, r7, r4 - ldrb r0, [r4] - mov r1, r10 - str r1, [sp] - mov r1, r9 - movs r2, 0x5 - movs r3, 0x1 - bl Contest_PrintTextToBg0WindowAt - ldrb r0, [r4] - mov r1, sp - adds r1, r5 - adds r1, 0x4 - mov r2, r10 - str r2, [sp] - movs r2, 0x37 - movs r3, 0x1 - bl Contest_PrintTextToBg0WindowAt - mov r1, r8 - lsls r0, r1, 24 - lsrs r7, r0, 24 - cmp r7, 0x3 - bls _080DF884 -_080DF920: - bl sub_80DB2BC -_080DF924: - add sp, 0x34 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80DF750 - - thumb_func_start sub_80DF940 -sub_80DF940: @ 80DF940 - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0x2 - ldrb r0, [r4] - cmp r0, 0xFC - bne _080DF956 - ldrb r0, [r4, 0x1] - cmp r0, 0x15 - bne _080DF956 - movs r0, 0x2 - b _080DF9CC -_080DF956: - adds r0, r4, 0 - bl StringLength - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bhi _080DF9CA - ldrb r0, [r4] - cmp r0, 0xFF - beq _080DF9CA -_080DF96A: - ldrb r1, [r4] - adds r0, r1, 0 - adds r0, 0x45 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x33 - bls _080DF9BE - adds r0, r1, 0 - adds r0, 0x5F - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x9 - bls _080DF9BE - adds r0, r1, 0 - cmp r0, 0 - beq _080DF9BE - cmp r0, 0xAD - beq _080DF9BE - cmp r0, 0xB8 - beq _080DF9BE - cmp r0, 0xAB - beq _080DF9BE - cmp r0, 0xAC - beq _080DF9BE - cmp r0, 0xB5 - beq _080DF9BE - cmp r0, 0xB6 - beq _080DF9BE - cmp r0, 0xBA - beq _080DF9BE - cmp r0, 0xAE - beq _080DF9BE - cmp r0, 0xB0 - beq _080DF9BE - cmp r0, 0xB1 - beq _080DF9BE - cmp r0, 0xB2 - beq _080DF9BE - cmp r0, 0xB3 - beq _080DF9BE - cmp r0, 0xB1 - bne _080DF9C8 -_080DF9BE: - adds r4, 0x1 - ldrb r0, [r4] - cmp r0, 0xFF - bne _080DF96A - b _080DF9CA -_080DF9C8: - movs r5, 0x1 -_080DF9CA: - adds r0, r5, 0 -_080DF9CC: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80DF940 - - thumb_func_start sub_80DF9D4 -sub_80DF9D4: @ 80DF9D4 - ldrb r2, [r0, 0x5] - movs r1, 0xFF - strb r1, [r0, 0x5] - strb r2, [r0, 0x7] - bx lr - thumb_func_end sub_80DF9D4 - - thumb_func_start sub_80DF9E0 -sub_80DF9E0: @ 80DF9E0 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - bl StripExtCtrlCodes - cmp r4, 0x1 - bne _080DF9F8 - movs r0, 0xFF - strb r0, [r5, 0x5] - movs r0, 0xFC - strb r0, [r5, 0xA] - b _080DFA00 -_080DF9F8: - ldrb r1, [r5, 0x5] - movs r0, 0xFF - strb r0, [r5, 0x5] - strb r1, [r5, 0xA] -_080DFA00: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DF9E0 - - thumb_func_start sub_80DFA08 -sub_80DFA08: @ 80DFA08 - push {r4-r6,lr} - adds r5, r0, 0 - adds r6, r1, 0 - adds r4, r5, 0x2 - cmp r6, 0x1 - bne _080DFA28 - adds r0, r4, 0 - bl sub_80DF940 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl ConvertInternationalString - b _080DFA3E -_080DFA28: - ldrb r0, [r4, 0xA] - cmp r0, 0xFC - bne _080DFA38 - adds r0, r4, 0 - movs r1, 0x1 - bl ConvertInternationalString - b _080DFA3E -_080DFA38: - strb r0, [r4, 0x5] - movs r0, 0xFF - strb r0, [r4, 0xA] -_080DFA3E: - adds r4, r5, 0 - adds r4, 0xD - cmp r6, 0x1 - bne _080DFA68 - movs r0, 0xFF - strb r0, [r4, 0x7] - ldrb r0, [r4, 0x4] - strb r0, [r4, 0x6] - ldrb r0, [r4, 0x3] - strb r0, [r4, 0x5] - ldrb r0, [r4, 0x2] - strb r0, [r4, 0x4] - ldrb r0, [r4, 0x1] - strb r0, [r4, 0x3] - ldrb r0, [r5, 0xD] - strb r0, [r4, 0x2] - movs r0, 0x15 - strb r0, [r4, 0x1] - movs r0, 0xFC - strb r0, [r5, 0xD] - b _080DFA70 -_080DFA68: - ldrb r0, [r4, 0x7] - strb r0, [r4, 0x5] - movs r0, 0xFF - strb r0, [r4, 0x7] -_080DFA70: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80DFA08 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/contest.h b/include/contest.h index 65db7b0bc5..35b88698e3 100644 --- a/include/contest.h +++ b/include/contest.h @@ -221,22 +221,6 @@ struct ContestPokemon /*0x3C*/ u32 otId; // otId }; // wow -extern struct ContestPokemon gContestMons[4]; -extern u8 gContestMonPartyIndex; -extern u16 gSpecialVar_ContestCategory; -extern u16 gSpecialVar_ContestRank; -extern u8 gUnknown_02039F2B; -extern u8 gNumLinkContestPlayers; -extern u8 gHighestRibbonRank; -extern u8 gContestFinalStandings[4]; -extern u8 gContestPlayerMonIndex; -extern s16 gUnknown_02039F08[4]; -extern s16 gUnknown_02039F10[4]; -extern s16 gUnknown_02039F18[4]; -extern s16 gContestMonConditions[4]; -extern u8 gIsLinkContest; -extern struct ContestWinner gUnknown_02039F3C; - struct Shared18000 { /*0x18000*/ u8 unk18000; @@ -260,10 +244,10 @@ struct ContestStruct_field_18 struct Contest { - /*0x19204*/ u8 playerMoveChoice; - /*0x19205*/ u8 turnNumber; - /*0x19206*/ u8 unk19206[4]; // seems to only be used by an unref function - /*0x1920A*/ u16 unk1920A_0:1; // Task active flags? + /*0x0*/ u8 playerMoveChoice; + /*0x1*/ u8 turnNumber; + /*0x2*/ u8 unk19206[4]; // seems to only be used by an unref function + /*0x6*/ u16 unk1920A_0:1; // Task active flags? u16 unk1920A_1:1; u16 unk1920A_2:1; u16 unk1920A_3:1; @@ -271,18 +255,18 @@ struct Contest u16 unk1920A_5:1; u16 unk1920A_6:1; u16 unk1920A_7:1; - /*0x1920B*/ u16 unk1920B_0:1; + /*0x7*/ u16 unk1920B_0:1; u16 unk1920B_1:1; u16 unk1920B_2:1; - /*0x1920C*/ u8 mainTaskId; - /*0x1920D*/ u8 unk1920D[4]; - /*0x19211*/ u8 unk19211; - /*0x19212*/ u8 unk19212; - /*0x19213*/ u8 filler19213; - /*0x19214*/ u8 unk19214; - /*0x19215*/ u8 unk19215; - /*0x19216*/ u8 unk19216; // sprite ID - /*0x19217*/ s8 applauseLevel; + /*0x8*/ u8 mainTaskId; + /*0x9*/ u8 unk1920D[4]; + /*0xD*/ u8 unk19211; + /*0xE*/ u8 unk19212; + /*0xF*/ u8 filler19213; + /*0x10*/ u8 unk19214; + /*0x11*/ u8 unk19215; + /*0x12*/ u8 unk19216; // sprite ID + /*0x13*/ s8 applauseLevel; /*0x19218*/ u8 unk19218[4]; /*0x1921C*/ u32 unk1921C; // saved RNG value? u16 unk19220[5][4]; // move history? @@ -395,7 +379,12 @@ struct UnknownContestStruct6 struct ContestResourcesField1C { - u8 filler_00[0x40]; + u16 unk0[5]; + s16 unkA; + u8 unkC; + u8 unkD; + u8 unkE_1:1; + u8 unkE_2:1; }; struct ContestResourcesField20 @@ -420,42 +409,62 @@ struct ContestResources void * field_3c; }; -extern struct ContestResources *gContestResources; - #define sContest (*gContestResources->field_0) #define sContestantStatus (gContestResources->field_4) #define shared192D0 (*gContestResources->field_8) #define eContestAI (gContestResources->field_C) #define shared19328 (*gContestResources->field_10) #define shared19338 (*gContestResources->field_14) - - - #define shared15800 (gHeap + 0x18000) #define shared16800 (gHeap + 0x19000) #define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000)) +extern struct ContestPokemon gContestMons[4]; +extern s16 gContestMonConditions[4]; +extern s16 gUnknown_02039F08[4]; +extern s16 gUnknown_02039F10[4]; +extern s16 gUnknown_02039F18[4]; +extern u8 gContestFinalStandings[4]; +extern u8 gContestMonPartyIndex; +extern u8 gContestPlayerMonIndex; +extern u8 gUnknown_02039F26[4]; +extern u8 gIsLinkContest; +extern u8 gUnknown_02039F2B; +extern u16 gSpecialVar_ContestCategory; +extern u16 gSpecialVar_ContestRank; +extern u8 gNumLinkContestPlayers; +extern u8 gHighestRibbonRank; +extern struct ContestResources *gContestResources; +extern u8 sContestBgCopyFlags; +extern struct ContestWinner gUnknown_02039F3C; extern u32 gContestRngValue; -extern u8 gUnknown_02039F26[4]; -bool8 IsSpeciesNotUnown(u16 species); +// contest.c +void ResetLinkContestBoolean(void); void LoadContestBgAfterMoveAnim(void); +void sub_80D7B24(void); +void sub_80DA8C8(u8 partyIndex); +void sub_80DAB8C(u8 contestType, u8 rank); +void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame); +u8 sub_80DAE0C(struct Pokemon *pkmn); +void sub_80DB09C(u8 contestCategory); +bool8 IsSpeciesNotUnown(u16 species); +bool8 Contest_IsMonsTurnDisabled(u8 a); +void sub_80DBED4(void); +void sub_80DCE58(u8 a); void SetContestantEffectStringID(u8 a, u8 b); void SetContestantEffectStringID2(u8 a, u8 b); +void SetStartledString(u8 contestant, u8 jam); void MakeContestantNervous(u8 p); -bool8 Contest_IsMonsTurnDisabled(u8 a); +s8 Contest_GetMoveExcitement(u16 move); bool8 sub_80DE1E8(u8 a); -void SetStartledString(u8 a, u8 b); -s8 Contest_GetMoveExcitement(u16); -u8 sub_80DAE0C(struct Pokemon *); -bool8 sub_80DEDA8(u8); -void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame); -void sub_80DB09C(u8 contestCategory); -void sub_80DCE58(u8); -void sub_80DFA08(struct ContestPokemon *mon, int language); -void sub_80DBED4(void); -u8 sub_80DEFA8(u8, u8); +void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s32 fontId); +void ResetContestLinkResults(void); +bool8 sub_80DEDA8(u8 a); +u8 sub_80DEFA8(u8 a, u8 b); +void ClearContestWinnerPicsInContestHall(void); +void sub_80DFA08(struct ContestPokemon *mon, s32 language); // contest link void sub_81D9DE4(u8 taskId); @@ -468,5 +477,4 @@ bool8 sub_80FC55C(void); bool8 sub_80FC530(u8); u8 sub_80F86E0(u8 *); - #endif //GUARD_CONTEST_H diff --git a/include/text.h b/include/text.h index d9c7a9a2e6..aa499f558f 100644 --- a/include/text.h +++ b/include/text.h @@ -13,10 +13,15 @@ #define CHAR_7 0xA8 #define CHAR_8 0xA9 #define CHAR_9 0xAA +#define CHAR_EXCL_MARK 0xAB #define CHAR_QUESTION_MARK 0xAC #define CHAR_PERIOD 0xAD #define CHAR_HYPHEN 0xAE #define CHAR_ELLIPSIS 0xB0 +#define CHAR_DOUBLE_QUOTATION_LEFT 0xB1 +#define CHAR_DOUBLE_QUOTATION_RIGHT 0xB2 +#define CHAR_SINGLE_QUOTATION_LEFT 0xB3 +#define CHAR_SINGLE_QUOTATION_RIGHT 0xB4 #define CHAR_MALE 0xB5 #define CHAR_FEMALE 0xB6 #define CHAR_CURRENCY 0xB7 diff --git a/include/tv.h b/include/tv.h index ea02268154..760d875228 100644 --- a/include/tv.h +++ b/include/tv.h @@ -56,5 +56,10 @@ void SaveRecordedItemPurchasesForTVShow(void); bool8 sub_80EE818(void); void sub_80EE8C8(u16 winStreak, u8 facilityAndMode); void BravoTrainerPokemonProfile_BeforeInterview2(u8 contestStandingPlace); +void ContestLiveUpdates_BeforeInterview_1(u8 a0); +void ContestLiveUpdates_BeforeInterview_2(u8 a0); +void ContestLiveUpdates_BeforeInterview_3(u8 a0); +void ContestLiveUpdates_BeforeInterview_4(u16 a0); +void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1); #endif //GUARD_TV_H diff --git a/ld_script.txt b/ld_script.txt index 844c64fb53..05c604febb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -136,7 +136,6 @@ SECTIONS { src/battle_anim_80D51AC.o(.text); src/item.o(.text); src/contest.o(.text); - asm/contest.o(.text); src/shop.o(.text); src/fldeff_escalator.o(.text); src/berry.o(.text); diff --git a/src/contest.c b/src/contest.c index e6e96b5ddf..799a190303 100644 --- a/src/contest.c +++ b/src/contest.c @@ -21,6 +21,7 @@ #include "overworld.h" #include "palette.h" #include "random.h" +#include "new_game.h" #include "script.h" #include "sound.h" #include "sprite.h" @@ -44,161 +45,155 @@ #include "constants/rgb.h" #include "contest_ai.h" -extern void (*gFieldCallback)(void); - -void sub_80D782C(void); -void sub_80D7C7C(u8 taskId); -void sub_80D7CB4(u8 taskId); -void sub_80D7DAC(u8 taskId); -void sub_80D7DC8(u8 taskId); -void sub_80D7DE8(u8 taskId); -bool8 sub_80D7E44(u8 *); -void sub_80D80C8(u8 taskId); -void sub_80D8108(u8 taskId); -void vblank_cb_battle(void); -void sub_80D823C(void); -void sub_80D833C(u8 taskId); -void sub_80D8424(u8 taskId); -void sub_80D8610(u8 taskId); -void sub_80D8490(u8 taskId); -void sub_80D880C(s8); -void sub_80D883C(s8); -void sub_80D8894(u8 taskId); -void sub_80D892C(u8 taskId); -void sub_80D895C(u8 taskId); -void sub_80D8A04(u8 taskId); -void sub_80D8A50(u8 taskId); -void sub_80D8A88(u8 taskId); -void sub_80D8B38(u8 taskId); -void sub_80DA110(u8); -void sub_80DA134(struct Sprite *); -void sub_80DA164(struct Sprite *); -void sub_80DA198(u8); -void sub_80DA25C(u8); -void sub_80DA28C(u8); -void sub_80DA31C(u8); -void sub_80DA348(u8); -void sub_80DA38C(u8); -void sub_80DA3CC(u8); -void sub_80DA464(u8); -void sub_80DA49C(u8); -void sub_80DA4CC(u8); -void sub_80DA51C(u8); -void sub_80DA5B4(u8); -void sub_80DA5E8(u8); -void sub_80DA6B4(u8); -void sub_80DA700(u8); -void sub_80DA740(u8); -void sub_80DA7A0(u8); -void sub_80DA7EC(u8); -void sub_80DA830(u8); -void sub_80DA874(void); -bool8 sub_80DA8A4(void); -void sub_80DAF04(u8); -void sub_80DAF1C(u8 a0, u8 a1); -void sub_80DAF88(u8); -void sub_80DAFA0(u8, u8); -u8 sub_80DB0C4(void); -u8 sub_80DB120(void); -u8 sub_80DB174(u16, u32, u32, u32); -void sub_80DB2BC(void); -void prints_contest_move_description(u16); -u16 SanitizeSpecies(u16); -void sub_80DB89C(void); -u16 GetChosenMove(u8); -void sub_80DB918(void); -bool8 Contest_IsMonsTurnDisabled(u8); -void sub_80DBF68(void); -void sub_80DBF90(void); -void sub_80DC2BC(void); -void sub_80DC490(bool8); -void sub_80DC4F0(void); -void CreateApplauseMeterSprite(void); -void sub_80DC5E8(void); -void sub_80DC7EC(void); -void sub_80DCD48(void); -void sub_80DCE58(u8); -void sub_80DD04C(void); -void sub_80DD590(void); -void sub_80DDB0C(void); -void sub_80DDBE8(void); -bool8 sub_80DE1E8(u8); -void sub_80DE224(void); -void sub_80DE350(void); -void sub_80DE424(u8); -void sub_80DE69C(u8); -void sub_80DEA20(void); -void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s32 fontId); -void Contest_StartTextPrinter(const u8 *, u32); -void ContestBG_FillBoxWithIncrementingTile(u8, u16, u8, u8, u8, u8, u8, s16); -bool32 Contest_RunTextPrinters(void); -void Contest_SetBgCopyFlags(u32); -void sub_80FC9F8(u8); -bool8 AreMovesContestCombo(u16, u16); -void sub_80DBD18(void); -void sub_80DF250(void); -void sub_80DF4F8(void); -void sub_80DD080(u8); -void sub_80DF080(u8); -void sub_80DF750(void); -void sub_80DE9DC(u8); -void sub_80DCBE8(u8, u8); -u8 sub_80DC9EC(u8); -u16 SanitizeMove(u16); -void sub_80DE864(u8); -void SelectContestMoveBankTarget(u16); -void sub_80DE9B0(u8); -void sub_80DC674(u8); -void sub_80DE12C(void); -void sub_80DD45C(u8, u8); -void sub_80DD720(u8); -void sub_80DE008(bool8); -u8 sub_80DC028(s16, s16, u8); -bool8 sub_80DB5B8(u8, u8); -bool8 sub_80DB798(u8); -void sub_80DB884(void); -void sub_80DC9B4(u8); -void sub_80DDED0(s8, s8); -void sub_80DDCDC(s8); -void sub_80DDE0C(void); -void sub_80DD940(void); -void sub_80DB944(void); -void sub_80DBA18(void); -void sub_80DC3AC(void); -bool8 sub_80DC3C4(void); -void sub_80DF9D4(u8 *); -void sub_80DF9E0(u8 *, s32); -void ContestBG_FillBoxWithTile(u8, u16, u8, u8, u8, u8, u8); -void Contest_PrintTextToBg0WindowStd(u32, const u8 *); -s16 sub_80DBD34(u8); -void DetermineFinalStandings(void); -bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *); -void sub_80DC0F4(u8); -void sub_80DC408(struct Sprite *); -void sub_80DC728(u8); -void sub_80DC6A4(u8); -void sub_80DC8D0(u8); -void sub_80DC81C(u8); -void sub_80DC87C(u8); -void sub_80DCC84(struct Sprite *); -void sub_80DCCD8(struct Sprite *sprite); -u8 sub_80DDA20(void); -void c3_08130B10(u8); -void sub_80DDB6C(u8); -void task08_080CD1CC(u8); -void sub_80DDD20(u8); -void sub_80DDE30(u8); -void sub_80DDF80(u8); -const u8 *GetTurnOrderNumberGfx(u8); -void sub_80DE464(u8); -void sub_80DE4A8(u8); -void sub_80DE5F4(u8); -void sub_80DE65C(u8); -void sub_80DE794(u8); -void sub_80DEA5C(void); -u8 sub_80DEFA8(u8, u8); +extern void sub_80FC9F8(u8); // contest_link_80FC4F4.c +// This file's functions. +static void sub_80D782C(void); +static void sub_80D7C7C(u8 taskId); +static void sub_80D7CB4(u8 taskId); +static void sub_80D7DAC(u8 taskId); +static void sub_80D7DC8(u8 taskId); +static void sub_80D7DE8(u8 taskId); +static bool8 sub_80D7E44(u8 *); +static void sub_80D80C8(u8 taskId); +static void sub_80D8108(u8 taskId); +static void vblank_cb_battle(void); +static void sub_80D823C(void); +static void sub_80D833C(u8 taskId); +static void sub_80D8424(u8 taskId); +static void sub_80D8610(u8 taskId); +static void sub_80D8490(u8 taskId); +static void sub_80D880C(s8); +static void sub_80D883C(s8); +static void sub_80D8894(u8 taskId); +static void sub_80D892C(u8 taskId); +static void sub_80D895C(u8 taskId); +static void sub_80D8A04(u8 taskId); +static void sub_80D8A50(u8 taskId); +static void sub_80D8A88(u8 taskId); +static void sub_80D8B38(u8 taskId); +static void sub_80DA110(u8); +static void sub_80DA134(struct Sprite *); +static void sub_80DA164(struct Sprite *); +static void sub_80DA198(u8); +static void sub_80DA25C(u8); +static void sub_80DA28C(u8); +static void sub_80DA31C(u8); +static void sub_80DA348(u8); +static void sub_80DA38C(u8); +static void sub_80DA3CC(u8); +static void sub_80DA464(u8); +static void sub_80DA49C(u8); +static void sub_80DA4CC(u8); +static void sub_80DA51C(u8); +static void sub_80DA5B4(u8); +static void sub_80DA5E8(u8); +static void sub_80DA6B4(u8); +static void sub_80DA700(u8); +static void sub_80DA740(u8); +static void sub_80DA7A0(u8); +static void sub_80DA7EC(u8); +static void sub_80DA830(u8); +static void sub_80DA874(void); +static bool8 sub_80DA8A4(void); +static void sub_80DAF04(u8); +static void sub_80DAF1C(u8 a0, u8 a1); +static void sub_80DAF88(u8); +static void sub_80DAFA0(u8, u8); +static u8 sub_80DB0C4(void); +static u8 sub_80DB120(void); +static u8 sub_80DB174(u16, u32, u32, u32); +static void prints_contest_move_description(u16); +static u16 SanitizeSpecies(u16); +static void sub_80DB89C(void); +static u16 GetChosenMove(u8); +static void sub_80DB918(void); +static void sub_80DBF68(void); +static void sub_80DBF90(void); +static void sub_80DC2BC(void); +static void sub_80DC490(bool8); +static void sub_80DC4F0(void); +static void CreateApplauseMeterSprite(void); +static void sub_80DC5E8(void); +static void sub_80DC7EC(void); +static void sub_80DCD48(void); +static void sub_80DD04C(void); +static void sub_80DD590(void); +static void sub_80DDB0C(void); +static void sub_80DDBE8(void); +static void sub_80DE224(void); +static void sub_80DE350(void); +static void sub_80DE424(u8); +static void sub_80DE69C(u8); +static void sub_80DEA20(void); +static void Contest_StartTextPrinter(const u8 *, u32); +static void ContestBG_FillBoxWithIncrementingTile(u8, u16, u8, u8, u8, u8, u8, s16); +static bool32 Contest_RunTextPrinters(void); +static void Contest_SetBgCopyFlags(u32); +static void sub_80DBD18(void); +static void sub_80DD080(u8); +static void sub_80DE9DC(u8); +static void sub_80DCBE8(u8, u8); +static u8 sub_80DC9EC(u8); +static u16 SanitizeMove(u16); +static void sub_80DE864(u8); +static void SelectContestMoveBankTarget(u16); +static void sub_80DE9B0(u8); +static void sub_80DC674(u8); +static void sub_80DE12C(void); +static void sub_80DD45C(u8, u8); +static void sub_80DD720(u8); +static void sub_80DE008(bool8); +static u8 sub_80DC028(s16, s16, u8); +static bool8 sub_80DB5B8(u8, u8); +static bool8 sub_80DB798(u8); +static void sub_80DB884(void); +static void sub_80DC9B4(u8); +static void sub_80DDED0(s8, s8); +static void sub_80DDCDC(s8); +static void sub_80DDE0C(void); +static void sub_80DD940(void); +static void sub_80DB944(void); +static void sub_80DBA18(void); +static void sub_80DC3AC(void); +static bool8 sub_80DC3C4(void); +static void ContestBG_FillBoxWithTile(u8, u16, u8, u8, u8, u8, u8); +static void Contest_PrintTextToBg0WindowStd(u32, const u8 *); +static s16 sub_80DBD34(u8); +static void DetermineFinalStandings(void); +static bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *); +static void sub_80DC0F4(u8); +static void sub_80DC408(struct Sprite *); +static void sub_80DC728(u8); +static void sub_80DC6A4(u8); +static void sub_80DC8D0(u8); +static void sub_80DC81C(u8); +static void sub_80DC87C(u8); +static void sub_80DCC84(struct Sprite *); +static void sub_80DCCD8(struct Sprite *sprite); +static u8 sub_80DDA20(void); +static void c3_08130B10(u8); +static void sub_80DDB6C(u8); +static void task08_080CD1CC(u8); +static void sub_80DDD20(u8); +static void sub_80DDE30(u8); +static void sub_80DDF80(u8); +static const u8 *GetTurnOrderNumberGfx(u8); +static void sub_80DE464(u8); +static void sub_80DE4A8(u8); +static void sub_80DE5F4(u8); +static void sub_80DE65C(u8); +static void sub_80DE794(u8); +static void sub_80DEA5C(void); +static void sub_80DF250(void); +static void sub_80DF4F8(void); +static void sub_80DF080(u8); +static void sub_80DF750(void); +static void sub_80DF9D4(u8 *); +static void sub_80DF9E0(u8 *, s32); +static void sub_80DB2BC(void); +// EWRAM vars. EWRAM_DATA struct ContestPokemon gContestMons[4] = {0}; EWRAM_DATA s16 gContestMonConditions[4] = {0}; EWRAM_DATA s16 gUnknown_02039F08[4] = {0}; @@ -216,10 +211,11 @@ EWRAM_DATA u16 gSpecialVar_ContestCategory = 0; EWRAM_DATA u16 gSpecialVar_ContestRank = 0; EWRAM_DATA u8 gNumLinkContestPlayers = 0; EWRAM_DATA u8 gHighestRibbonRank = 0; -EWRAM_DATA struct ContestResources * gContestResources = NULL; +EWRAM_DATA struct ContestResources *gContestResources = NULL; EWRAM_DATA u8 sContestBgCopyFlags = 0; EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0}; +// IWRAM common vars. u32 gContestRngValue; extern const u16 gUnknown_08587C30[]; @@ -249,6 +245,8 @@ extern const u8 gText_Contest_Anxiety[]; extern const u8 gText_Contest_Laziness[]; extern const u8 gText_Contest_Hesitancy[]; extern const u8 gText_Contest_Fear[]; +extern const u8 gText_BDot[]; +extern const u8 gText_CDot[]; extern const u8 *const gUnknown_08587E10[]; extern const struct ContestPokemon gContestOpponents[96]; extern const u8 gUnknown_085898A4[96]; @@ -271,12 +269,14 @@ extern const struct SubspriteTable gSubspriteTables_8587B80[]; extern const struct CompressedSpriteSheet gUnknown_08587BB0; extern const struct SpritePalette gUnknown_08587BB8; extern const struct SpriteTemplate gSpriteTemplate_8587BC8; -extern bool8 gUnknown_020322D5; extern void (*const gContestEffectFuncs[])(void); extern const s8 gContestExcitementTable[][5]; extern const struct ContestWinner gUnknown_08587FA4[]; +extern const struct CompressedSpriteSheet gUnknown_08589904[]; +extern const struct SpritePalette gUnknown_08589924[]; +extern const struct SpriteTemplate gSpriteTemplate_858998C[]; -void TaskDummy1(u8 taskId) +static void TaskDummy1(u8 taskId) { } @@ -285,7 +285,7 @@ void ResetLinkContestBoolean(void) gIsLinkContest = 0; } -void sub_80D7678(void) +static void sub_80D7678(void) { u16 savedIme; @@ -329,7 +329,7 @@ void LoadContestBgAfterMoveAnim(void) } } -void sub_80D779C(void) +static void sub_80D779C(void) { s32 i; @@ -342,7 +342,7 @@ void sub_80D779C(void) } } -void sub_80D77E4(void) +static void sub_80D77E4(void) { InitWindows(gUnknown_08587F44); DeactivateAllTextPrinters(); @@ -356,7 +356,7 @@ void sub_80D77E4(void) } } -void sub_80D782C(void) +static void sub_80D782C(void) { s32 i; @@ -367,7 +367,7 @@ void sub_80D782C(void) FillPalette(RGB(31, 17, 31), 0xF3, 2); } -void sub_80D787C(void) +static void sub_80D787C(void) { s32 i; @@ -398,10 +398,10 @@ void sub_80D787C(void) gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i]; } sub_80DD590(); - *gContestResources->field_1c = (struct ContestResourcesField1C){}; + memset(gContestResources->field_1c, 0, sizeof(*gContestResources->field_1c) * 4); } -void sub_80D7988(void) +static void sub_80D7988(void) { gContestResources = AllocZeroed(sizeof(struct ContestResources)); gContestResources->field_0 = AllocZeroed(sizeof(struct Contest)); @@ -411,7 +411,7 @@ void sub_80D7988(void) gContestResources->field_10 = AllocZeroed(sizeof(struct UnknownContestStruct5) * 4); gContestResources->field_14 = AllocZeroed(sizeof(struct UnknownContestStruct4) * 4); gContestResources->field_18 = AllocZeroed(sizeof(struct ContestStruct_field_18)); - gContestResources->field_1c = AllocZeroed(sizeof(struct ContestResourcesField1C)); + gContestResources->field_1c = AllocZeroed(sizeof(struct ContestResourcesField1C) * 4); gContestResources->field_20 = AllocZeroed(sizeof(struct ContestResourcesField20)); gContestResources->field_24[0] = AllocZeroed(0x1000); gContestResources->field_24[1] = AllocZeroed(0x1000); @@ -424,7 +424,7 @@ void sub_80D7988(void) gUnknown_02023060 = gContestResources->field_24[1]; } -void sub_80D7A5C(void) +static void sub_80D7A5C(void) { FREE_AND_SET_NULL(gContestResources->field_0); FREE_AND_SET_NULL(gContestResources->field_4); @@ -502,7 +502,7 @@ void sub_80D7B24(void) } } -void sub_80D7C7C(u8 taskId) +static void sub_80D7C7C(u8 taskId) { if (!gPaletteFade.active) { @@ -511,7 +511,7 @@ void sub_80D7C7C(u8 taskId) } } -void sub_80D7CB4(u8 taskId) +static void sub_80D7CB4(u8 taskId) { if (gIsLinkContest & 1) { @@ -554,18 +554,18 @@ void sub_80D7CB4(u8 taskId) } } -void sub_80D7DAC(u8 taskId) +static void sub_80D7DAC(u8 taskId) { SetTaskFuncWithFollowupFunc(taskId, sub_80FC998, sub_80D7DC8); } -void sub_80D7DC8(u8 taskId) +static void sub_80D7DC8(u8 taskId) { gTasks[taskId].data[0] = 1; gTasks[taskId].func = sub_80D7DE8; } -void sub_80D7DE8(u8 taskId) +static void sub_80D7DE8(u8 taskId) { gTasks[taskId].data[0]--; if (gTasks[taskId].data[0] <= 0) @@ -577,7 +577,7 @@ void sub_80D7DE8(u8 taskId) } } -u8 sub_80D7E44(u8 *a) +static u8 sub_80D7E44(u8 *a) { u16 sp0[16]; u16 sp20[16]; @@ -651,7 +651,7 @@ u8 sub_80D7E44(u8 *a) return 0; } -void sub_80D80C8(u8 taskId) +static void sub_80D80C8(u8 taskId) { gPaletteFade.bufferTransferDisabled = FALSE; if (!gPaletteFade.active) @@ -662,7 +662,7 @@ void sub_80D80C8(u8 taskId) } } -void sub_80D8108(u8 taskId) +static void sub_80D8108(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -706,7 +706,7 @@ void sub_80D8108(u8 taskId) } } -void sub_80D823C(void) +static void sub_80D823C(void) { s32 i; @@ -723,7 +723,7 @@ void sub_80D823C(void) sContestBgCopyFlags = 0; } -void vblank_cb_battle(void) +static void vblank_cb_battle(void) { SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_X); SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_Y); @@ -743,7 +743,7 @@ void vblank_cb_battle(void) ScanlineEffect_InitHBlankDmaTransfer(); } -void sub_80D833C(u8 taskId) +static void sub_80D833C(u8 taskId) { if (gTasks[taskId].data[0] == 0) { @@ -771,7 +771,7 @@ void sub_80D833C(u8 taskId) } } -void sub_80D8424(u8 taskId) +static void sub_80D8424(u8 taskId) { if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys == B_BUTTON)) { @@ -788,7 +788,7 @@ void sub_80D8424(u8 taskId) } } -void sub_80D8490(u8 taskId) +static void sub_80D8490(u8 taskId) { u8 i; u8 sp8[32]; @@ -826,7 +826,7 @@ void sub_80D8490(u8 taskId) gTasks[taskId].func = sub_80D8610; } -void sub_80D8610(u8 taskId) +static void sub_80D8610(u8 taskId) { u8 numMoves = 0; s32 i; @@ -890,18 +890,18 @@ void sub_80D8610(u8 taskId) } } -void sub_80D880C(s8 a0) +static void sub_80D880C(s8 a0) { ContestBG_FillBoxWithIncrementingTile(2, 55, 0, 31 + a0 * 2, 2, 2, 17, 1); } -void sub_80D883C(s8 a0) +static void sub_80D883C(s8 a0) { ContestBG_FillBoxWithIncrementingTile(2, 11, 0, 31 + a0 * 2, 2, 1, 17, 1); ContestBG_FillBoxWithIncrementingTile(2, 11, 0, 32 + a0 * 2, 2, 1, 17, 1); } -void sub_80D8894(u8 taskId) +static void sub_80D8894(u8 taskId) { if (gIsLinkContest & 1) { @@ -922,13 +922,13 @@ void sub_80D8894(u8 taskId) } } -void sub_80D892C(u8 taskId) +static void sub_80D892C(u8 taskId) { DestroyTask(taskId); gTasks[gContestResources->field_0->mainTaskId].func = sub_80D895C; } -void sub_80D895C(u8 taskId) +static void sub_80D895C(u8 taskId) { s32 i; @@ -952,7 +952,7 @@ void sub_80D895C(u8 taskId) gTasks[taskId].func = sub_80D8A04; } -void sub_80D8A04(u8 taskId) +static void sub_80D8A04(u8 taskId) { if (++gTasks[taskId].data[0] > 2) { @@ -966,13 +966,13 @@ void sub_80D8A04(u8 taskId) } } -void sub_80D8A50(u8 taskId) +static void sub_80D8A50(u8 taskId) { if (!gContestResources->field_0->unk1920A_6 && !gContestResources->field_0->unk1920B_1) gTasks[taskId].func = sub_80D8A88; } -void sub_80D8A88(u8 taskId) +static void sub_80D8A88(u8 taskId) { if (++gTasks[taskId].data[0] > 19) { @@ -992,7 +992,7 @@ void sub_80D8A88(u8 taskId) } } -void sub_80D8B38(u8 taskId) +static void sub_80D8B38(u8 taskId) { u8 spriteId; s32 i; @@ -1698,13 +1698,13 @@ void sub_80D8B38(u8 taskId) } } -void sub_80DA110(u8 taskId) +static void sub_80DA110(u8 taskId) { sContest.unk1920B_2 = 0; DestroyTask(taskId); } -void sub_80DA134(struct Sprite *sprite) +static void sub_80DA134(struct Sprite *sprite) { if (sprite->pos2.x != 0) { @@ -1720,7 +1720,7 @@ void sub_80DA134(struct Sprite *sprite) } } -void sub_80DA164(struct Sprite *sprite) +static void sub_80DA164(struct Sprite *sprite) { sprite->pos2.x -= 6; if (sprite->pos1.x + sprite->pos2.x < -32) @@ -1730,7 +1730,7 @@ void sub_80DA164(struct Sprite *sprite) } } -void sub_80DA198(u8 taskId) +static void sub_80DA198(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -1768,7 +1768,7 @@ void sub_80DA198(u8 taskId) } } -void sub_80DA25C(u8 taskId) +static void sub_80DA25C(u8 taskId) { sub_80DE008(FALSE); gTasks[taskId].data[0] = 0; @@ -1776,7 +1776,7 @@ void sub_80DA25C(u8 taskId) gTasks[taskId].func = sub_80DA28C; } -void sub_80DA28C(u8 taskId) +static void sub_80DA28C(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -1807,13 +1807,13 @@ void sub_80DA28C(u8 taskId) } } -void sub_80DA31C(u8 taskId) +static void sub_80DA31C(u8 taskId) { if (sub_80DC3C4()) gTasks[taskId].func = sub_80DA348; } -void sub_80DA348(u8 taskId) +static void sub_80DA348(u8 taskId) { DmaCopy32Defvars(3, shared18000.unk18204, gPlttBufferUnfaded, 0x400); gTasks[taskId].data[0] = 0; @@ -1821,7 +1821,7 @@ void sub_80DA348(u8 taskId) gTasks[taskId].func = sub_80DA38C; } -void sub_80DA38C(u8 taskId) +static void sub_80DA38C(u8 taskId) { if (++gTasks[taskId].data[0] > 2) { @@ -1831,7 +1831,7 @@ void sub_80DA38C(u8 taskId) } } -void sub_80DA3CC(u8 taskId) +static void sub_80DA3CC(u8 taskId) { if (gTasks[taskId].data[0] == 0) { @@ -1854,7 +1854,7 @@ void sub_80DA3CC(u8 taskId) } } -void sub_80DA464(u8 taskId) +static void sub_80DA464(u8 taskId) { if (gTasks[taskId].data[0]++ > 29) { @@ -1864,7 +1864,7 @@ void sub_80DA464(u8 taskId) } } -void sub_80DA49C(u8 taskId) +static void sub_80DA49C(u8 taskId) { if (sub_80DC3C4()) { @@ -1873,19 +1873,19 @@ void sub_80DA49C(u8 taskId) } } -void sub_80DA4CC(u8 taskId) +static void sub_80DA4CC(u8 taskId) { sub_80DE224(); gTasks[taskId].func = sub_80DE424; } -void sub_80DA4F4(u8 taskId) +static void sub_80DA4F4(u8 taskId) { sub_80DE350(); gTasks[taskId].func = sub_80DA51C; } -void sub_80DA51C(u8 taskId) +static void sub_80DA51C(u8 taskId) { vu16 sp0 = GetGpuReg(REG_OFFSET_BG0CNT); vu16 sp2 = GetGpuReg(REG_OFFSET_BG2CNT); @@ -1905,13 +1905,13 @@ void sub_80DA51C(u8 taskId) } } -void sub_80DA5B4(u8 taskId) +static void sub_80DA5B4(u8 taskId) { if (!sContest.unk1920A_6) gTasks[taskId].func = sub_80D833C; } -void sub_80DA5E8(u8 taskId) +static void sub_80DA5E8(u8 taskId) { s32 i; @@ -1936,7 +1936,7 @@ void sub_80DA5E8(u8 taskId) gTasks[taskId].func = sub_80DA6B4; } -void sub_80DA6B4(u8 taskId) +static void sub_80DA6B4(u8 taskId) { if (!Contest_RunTextPrinters()) { @@ -1949,7 +1949,7 @@ void sub_80DA6B4(u8 taskId) } } -void sub_80DA700(u8 taskId) +static void sub_80DA700(u8 taskId) { gBattle_BG1_Y -= 7; if ((s16)gBattle_BG1_Y < 0) @@ -1961,7 +1961,7 @@ void sub_80DA700(u8 taskId) } } -void sub_80DA740(u8 taskId) +static void sub_80DA740(u8 taskId) { if (gTasks[taskId].data[0]++ >= 50) { @@ -1978,7 +1978,7 @@ void sub_80DA740(u8 taskId) } } -void sub_80DA7A0(u8 taskId) +static void sub_80DA7A0(u8 taskId) { u8 taskId2 = CreateTask(sub_80FCACC, 0); @@ -1988,14 +1988,14 @@ void sub_80DA7A0(u8 taskId) sub_80DC490(FALSE); } -void sub_80DA7EC(u8 taskId) +static void sub_80DA7EC(u8 taskId) { DestroyTask(taskId); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[sContest.mainTaskId].func = sub_80DA830; } -void sub_80DA830(u8 taskId) +static void sub_80DA830(u8 taskId) { if (!gPaletteFade.active) { @@ -2008,19 +2008,19 @@ void sub_80DA830(u8 taskId) } } -void sub_80DA874(void) +static void sub_80DA874(void) { ScriptContext2_Disable(); EnableBothScriptContexts(); } -void sub_80DA884(void) +static void sub_80DA884(void) { if (!(gIsLinkContest & 1)) gContestPlayerMonIndex = 3; } -bool8 sub_80DA8A4(void) +static bool8 sub_80DA8A4(void) { if (gContestPlayerMonIndex == gUnknown_02039F2B) return TRUE; @@ -2250,7 +2250,7 @@ u8 sub_80DAE0C(struct Pokemon *pkmn) return retVal; } -void sub_80DAEA4(void) +static void sub_80DAEA4(void) { s32 i; @@ -2262,7 +2262,7 @@ void sub_80DAEA4(void) } } -u8 *sub_80DAED4(const u8 *src, u8 color) +static u8 *sub_80DAED4(const u8 *src, u8 color) { u8 * ptr = StringCopy(gDisplayedStringBattle, gText_ColorTransparent); ptr[-1] = color; @@ -2271,12 +2271,12 @@ u8 *sub_80DAED4(const u8 *src, u8 color) return ptr; } -void sub_80DAF04(u8 a0) +static void sub_80DAF04(u8 a0) { sub_80DAF1C(a0, a0 + 10); } -void sub_80DAF1C(u8 a0, u8 a1) +static void sub_80DAF1C(u8 a0, u8 a1) { u8 buffer[32]; s32 offset; @@ -2290,18 +2290,18 @@ void sub_80DAF1C(u8 a0, u8 a1) Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[a0], gDisplayedStringBattle, offset, 1, 7); } -void sub_80DAF88(u8 a0) +static void sub_80DAF88(u8 a0) { sub_80DAFA0(a0, a0 + 10); } -void sub_80DAFA0(u8 a0, u8 a1) +static void sub_80DAFA0(u8 a0, u8 a1) { sub_80DAED4(gContestMons[a0].nickname, a1); Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[a0], gDisplayedStringBattle, 5, 1, 7); } -u16 sub_80DAFE0(u8 who, u8 contestCategory) +static u16 sub_80DAFE0(u8 who, u8 contestCategory) { u8 statMain; u8 statSub1; @@ -2347,7 +2347,7 @@ void sub_80DB09C(u8 contestCategory) gContestMonConditions[i] = sub_80DAFE0(i, contestCategory); } -u8 sub_80DB0C4(void) +static u8 sub_80DB0C4(void) { u8 spriteId; @@ -2359,7 +2359,7 @@ u8 sub_80DB0C4(void) return spriteId; } -u8 sub_80DB120(void) +static u8 sub_80DB120(void) { u8 spriteId; @@ -2371,7 +2371,7 @@ u8 sub_80DB120(void) return spriteId; } -u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index) +static u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index) { u8 spriteId; species = SanitizeSpecies(species); @@ -2408,13 +2408,13 @@ bool8 IsSpeciesNotUnown(u16 species) return TRUE; } -void sub_80DB2BC(void) +static void sub_80DB2BC(void) { CpuCopy16(gContestResources->field_24[0], gContestResources->field_24[0] + 0x500, 0x280); CpuCopy16(gContestResources->field_24[2], gContestResources->field_24[2] + 0x500, 0x280); } -u16 sub_80DB2EC(u16 a0, u8 a1) +static u16 sub_80DB2EC(u16 a0, u8 a1) { u16 var; @@ -2437,7 +2437,7 @@ u16 sub_80DB2EC(u16 a0, u8 a1) return var; } -void prints_contest_move_description(u16 a) +static void prints_contest_move_description(u16 a) { u8 category; u16 categoryTile; @@ -2481,7 +2481,7 @@ void prints_contest_move_description(u16 a) Contest_PrintTextToBg0WindowStd(9, gText_Slash); } -void sub_80DB4E0(u16 move, u8 b) +static void sub_80DB4E0(u16 move, u8 b) { u8 r7 = gUnknown_02039F26[b] * 5 + 2; @@ -2498,7 +2498,7 @@ void sub_80DB4E0(u16 move, u8 b) } } -void sub_80DB584(void) +static void sub_80DB584(void) { s32 i; @@ -2506,12 +2506,12 @@ void sub_80DB584(void) sub_80DB4E0(gContestResources->field_4[i].currMove, i); } -u16 sub_80DB5B0(void) +static u16 sub_80DB5B0(void) { return 0x2034; } -bool8 sub_80DB5B8(u8 contestantIdx, bool8 resetMod) +static bool8 sub_80DB5B8(u8 contestantIdx, bool8 resetMod) { u8 r6; s32 r4; @@ -2541,7 +2541,7 @@ bool8 sub_80DB5B8(u8 contestantIdx, bool8 resetMod) return TRUE; } -void sub_80DB69C(void) +static void sub_80DB69C(void) { s32 i; s32 r6; @@ -2557,7 +2557,7 @@ void sub_80DB69C(void) } } -u16 sub_80DB748(u8 status) +static u16 sub_80DB748(u8 status) { u16 var = 0; @@ -2583,7 +2583,7 @@ u16 sub_80DB748(u8 status) return var; } -bool8 sub_80DB798(u8 a) +static bool8 sub_80DB798(u8 a) { bool8 r9 = TRUE; u16 r8 = 0; @@ -2609,7 +2609,7 @@ bool8 sub_80DB798(u8 a) return r9; } -void sub_80DB884(void) +static void sub_80DB884(void) { s32 i; @@ -2617,14 +2617,14 @@ void sub_80DB884(void) sub_80DB798(i); } -void sub_80DB89C(void) +static void sub_80DB89C(void) { FillWindowPixelBuffer(4, 0); CopyWindowToVram(4, 2); Contest_SetBgCopyFlags(0); } -u16 GetChosenMove(u8 a) +static u16 GetChosenMove(u8 a) { if (Contest_IsMonsTurnDisabled(a)) return 0; @@ -2642,7 +2642,7 @@ u16 GetChosenMove(u8 a) } } -void sub_80DB918(void) +static void sub_80DB918(void) { s32 i; @@ -2650,7 +2650,7 @@ void sub_80DB918(void) sContestantStatus[i].currMove = GetChosenMove(i); } -void sub_80DB944(void) +static void sub_80DB944(void) { s32 i; s32 j; @@ -2689,7 +2689,7 @@ void sub_80DB944(void) sub_80DD590(); } -void sub_80DBA18(void) +static void sub_80DBA18(void) { s32 i; @@ -2714,7 +2714,7 @@ void sub_80DBA18(void) } } -bool8 sub_80DBA68(u8 a) +static bool8 sub_80DBA68(u8 a) { if (sContestantStatus[a].numTurnsSkipped != 0 || sContestantStatus[a].noMoreTurns) return FALSE; @@ -2722,7 +2722,7 @@ bool8 sub_80DBA68(u8 a) return TRUE; } -void sub_80DBAA0(void) +static void sub_80DBAA0(void) { s32 i; @@ -2777,13 +2777,13 @@ bool8 Contest_IsMonsTurnDisabled(u8 a) return FALSE; } -void sub_80DBCE0(u8 a) +static void sub_80DBCE0(u8 a) { gUnknown_02039F18[a] = sub_80DBD34(a); gUnknown_02039F08[a] = gContestMonConditions[a] + gUnknown_02039F18[a]; } -void sub_80DBD18(void) +static void sub_80DBD18(void) { s32 i; @@ -2792,12 +2792,12 @@ void sub_80DBD18(void) DetermineFinalStandings(); } -s16 sub_80DBD34(u8 a) +static s16 sub_80DBD34(u8 a) { return gUnknown_02039F10[a] * 2; } -void DetermineFinalStandings(void) +static void DetermineFinalStandings(void) { u16 sp0[4] = {0}; struct UnknownContestStruct6 sp8[4]; @@ -2868,7 +2868,7 @@ void sub_80DBED4(void) } } -bool8 sub_80DBF30(s32 a, s32 b, struct UnknownContestStruct6 *c) +static bool8 sub_80DBF30(s32 a, s32 b, struct UnknownContestStruct6 *c) { bool8 retVal; @@ -2887,7 +2887,7 @@ bool8 sub_80DBF30(s32 a, s32 b, struct UnknownContestStruct6 *c) return retVal; } -void sub_80DBF68(void) +static void sub_80DBF68(void) { gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; @@ -2895,7 +2895,7 @@ void sub_80DBF68(void) Contest_StartTextPrinter((u8*) &gUnknown_0827E8DA, 0); } -void sub_80DBF90(void) +static void sub_80DBF90(void) { int i; @@ -2905,7 +2905,7 @@ void sub_80DBF90(void) } } -u16 sub_80DBFC8(u8 a) +static u16 sub_80DBFC8(u8 a) { u16 var; @@ -2920,7 +2920,7 @@ u16 sub_80DBFC8(u8 a) return var + 1; } -s8 sub_80DBFFC(s16 a) +static s8 sub_80DBFFC(s16 a) { s8 retVal = a / 10; @@ -2931,7 +2931,7 @@ s8 sub_80DBFFC(s16 a) return retVal; } -u8 sub_80DC028(s16 a, s16 b, u8 c) +static u8 sub_80DC028(s16 a, s16 b, u8 c) { u8 taskId; s8 r4; @@ -2952,7 +2952,7 @@ u8 sub_80DC028(s16 a, s16 b, u8 c) return taskId; } -void sub_80DC0F4(u8 taskId) +static void sub_80DC0F4(u8 taskId) { u8 r7 = gTasks[taskId].data[3]; s16 r3 = gTasks[taskId].data[0]; @@ -3044,7 +3044,7 @@ void sub_80DC0F4(u8 taskId) } } -void sub_80DC2BC(void) +static void sub_80DC2BC(void) { s32 i; @@ -3057,7 +3057,7 @@ void sub_80DC2BC(void) } } -void sub_80DC308(u8 a) +static void sub_80DC308(u8 a) { u8 spriteId; s16 r5; @@ -3079,7 +3079,7 @@ void sub_80DC308(u8 a) gSprites[spriteId].callback = sub_80DC408; } -void sub_80DC3AC(void) +static void sub_80DC3AC(void) { s32 i; @@ -3087,7 +3087,7 @@ void sub_80DC3AC(void) sub_80DC308(i); } -bool8 sub_80DC3C4(void) +static bool8 sub_80DC3C4(void) { s32 i; @@ -3102,7 +3102,7 @@ bool8 sub_80DC3C4(void) return FALSE; } -void sub_80DC408(struct Sprite *sprite) +static void sub_80DC408(struct Sprite *sprite) { if (sprite->pos2.x == sprite->data[1]) { @@ -3115,7 +3115,7 @@ void sub_80DC408(struct Sprite *sprite) } } -void sub_80DC44C(void) +static void sub_80DC44C(void) { s32 i; @@ -3123,7 +3123,7 @@ void sub_80DC44C(void) gSprites[gContestResources->field_14[i].unk0].pos1.y = gUnknown_08587A6C[gUnknown_02039F26[i]]; } -void sub_80DC490(bool8 a) +static void sub_80DC490(bool8 a) { s32 i; @@ -3139,7 +3139,7 @@ void sub_80DC490(bool8 a) } } -void sub_80DC4F0(void) +static void sub_80DC4F0(void) { s32 i; @@ -3156,7 +3156,7 @@ void sub_80DC4F0(void) } } -void CreateApplauseMeterSprite(void) +static void CreateApplauseMeterSprite(void) { u8 spriteId; @@ -3167,7 +3167,7 @@ void CreateApplauseMeterSprite(void) sContest.applauseMeterSpriteId = spriteId; } -void sub_80DC5E8(void) +static void sub_80DC5E8(void) { u8 i; u8 taskId = CreateTask(sub_80DC728, 30); @@ -3177,20 +3177,20 @@ void sub_80DC5E8(void) gTasks[taskId].data[i * 4] = 0xFF; } -void sub_80DC630(u8 a) +static void sub_80DC630(u8 a) { gTasks[sContest.unk19211].data[a * 4 + 0] = 0; gTasks[sContest.unk19211].data[a * 4 + 1] = 0; } -void sub_80DC674(u8 a) +static void sub_80DC674(u8 a) { u8 taskId = CreateTask(sub_80DC6A4, 31); gTasks[taskId].data[0] = a; } -void sub_80DC6A4(u8 taskId) +static void sub_80DC6A4(u8 taskId) { u8 r4 = gTasks[taskId].data[0]; @@ -3204,7 +3204,7 @@ void sub_80DC6A4(u8 taskId) } } -void sub_80DC728(u8 taskId) +static void sub_80DC728(u8 taskId) { u8 i; @@ -3232,7 +3232,7 @@ void sub_80DC728(u8 taskId) } } -void sub_80DC7EC(void) +static void sub_80DC7EC(void) { s32 i; @@ -3241,13 +3241,13 @@ void sub_80DC7EC(void) sub_80DC81C(i); } -void sub_80DC81C(u8 a) +static void sub_80DC81C(u8 a) { gTasks[sContest.unk19212].data[a * 4 + 0] = 0xFF; gTasks[sContest.unk19212].data[a * 4 + 1] = 0; } -void sub_80DC864(void) +static void sub_80DC864(void) { s32 i; @@ -3255,7 +3255,7 @@ void sub_80DC864(void) sub_80DC87C(i); } -void sub_80DC87C(u8 a) +static void sub_80DC87C(u8 a) { u32 var; u32 r0; @@ -3274,7 +3274,7 @@ void sub_80DC87C(u8 a) 2); } -void sub_80DC8D0(u8 taskId) +static void sub_80DC8D0(u8 taskId) { u8 i; @@ -3304,7 +3304,7 @@ void sub_80DC8D0(u8 taskId) } } -void sub_80DC9B4(u8 a) +static void sub_80DC9B4(u8 a) { if (sContestantStatus[a].hasJudgesAttention) sub_80DC630(a); @@ -3312,11 +3312,7 @@ void sub_80DC9B4(u8 a) sub_80DC674(a); } -extern const struct CompressedSpriteSheet gUnknown_08589904[]; -extern const struct SpritePalette gUnknown_08589924[]; -extern const struct SpriteTemplate gSpriteTemplate_858998C[]; - -u8 sub_80DC9EC(u8 a) +static u8 sub_80DC9EC(u8 a) { u8 spriteId1, spriteId2; u8 x = gUnknown_02039F26[a] * 40 + 32; @@ -3360,7 +3356,7 @@ u8 sub_80DC9EC(u8 a) return spriteId1; } -void sub_80DCB78(u8 spriteId) +static void sub_80DCB78(u8 spriteId) { u8 spriteId2 = gSprites[spriteId].data[0]; @@ -3369,19 +3365,19 @@ void sub_80DCB78(u8 spriteId) DestroySpriteAndFreeResources(&gSprites[spriteId]); } -void sub_80DCBB4(void) +static void sub_80DCBB4(void) { SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(7, 9)); } -void sub_80DCBD0(void) +static void sub_80DCBD0(void) { SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); } -void sub_80DCBE8(u8 a, bool8 b) +static void sub_80DCBE8(u8 a, bool8 b) { u8 r5; @@ -3398,7 +3394,7 @@ void sub_80DCBE8(u8 a, bool8 b) PlaySE(SE_PC_LOGIN); } -void sub_80DCC84(struct Sprite *sprite) +static void sub_80DCC84(struct Sprite *sprite) { if (sprite->affineAnimEnded) { @@ -3413,14 +3409,14 @@ void sub_80DCC84(struct Sprite *sprite) } } -void sub_80DCCD8(struct Sprite *sprite) +static void sub_80DCCD8(struct Sprite *sprite) { gContestResources->field_14[sprite->data[1]].unk2_1 = 0; sub_80DCB78(sprite->data[0]); sub_80DCBD0(); } -void sub_80DCD08(void) +static void sub_80DCD08(void) { if(gHeap[0x1A000] == 1) gHeap[0x1A000] = 0; @@ -3438,7 +3434,7 @@ void sub_80DCD08(void) } } -void sub_80DCD48(void) +static void sub_80DCD48(void) { u8 i; s16 value; @@ -3569,7 +3565,7 @@ void sub_80DCE58(u8 a) } } -void sub_80DD04C(void) +static void sub_80DD04C(void) { s32 i; @@ -3580,7 +3576,7 @@ void sub_80DD04C(void) sub_80DAEA4(); } -void sub_80DD080(u8 contestant) +static void sub_80DD080(u8 contestant) { u16 move; u8 effect; @@ -3721,7 +3717,7 @@ void SetStartledString(u8 contestant, u8 jam) SetContestantEffectStringID(contestant, CONTEST_STRING_LOOKED_DOWN); } -void sub_80DD45C(u8 contestant, u8 stringId) +static void sub_80DD45C(u8 contestant, u8 stringId) { StringCopy(gStringVar1, gContestMons[contestant].nickname); StringCopy(gStringVar2, gMoveNames[sContestantStatus[contestant].currMove]); @@ -3746,7 +3742,7 @@ void MakeContestantNervous(u8 p) sContestantStatus[p].currMove = MOVE_NONE; } -void sub_80DD590(void) +static void sub_80DD590(void) { u8 r12 = 0; s32 i; @@ -3802,7 +3798,7 @@ void sub_80DD590(void) } } -void sub_80DD6DC(struct Sprite *sprite) +static void sub_80DD6DC(struct Sprite *sprite) { if (sprite->data[1]++ > 84) { @@ -3813,7 +3809,7 @@ void sub_80DD6DC(struct Sprite *sprite) } } -void sub_80DD720(u8 a) +static void sub_80DD720(u8 a) { u8 spriteId = sContest.unk19216; @@ -3860,7 +3856,7 @@ void sub_80DD720(u8 a) sContest.unk1920A_4 = 1; } -void sub_80DD940(void) +static void sub_80DD940(void) { s32 i; @@ -3885,7 +3881,7 @@ s8 Contest_GetMoveExcitement(u16 move) return gContestExcitementTable[gSpecialVar_ContestCategory][gContestMoves[move].contestCategory]; } -u8 sub_80DDA20(void) +static u8 sub_80DDA20(void) { u8 taskId = CreateTask(c3_08130B10, 10); @@ -3894,7 +3890,7 @@ u8 sub_80DDA20(void) return taskId; } -void c3_08130B10(u8 taskId) +static void c3_08130B10(u8 taskId) { if (++gTasks[taskId].data[0] == 1) { @@ -3916,7 +3912,7 @@ void c3_08130B10(u8 taskId) } } -void sub_80DDB0C(void) +static void sub_80DDB0C(void) { CreateTask(sub_80DDB6C, 10); gSprites[sContest.applauseMeterSpriteId].pos2.x = -70; @@ -3924,7 +3920,7 @@ void sub_80DDB0C(void) sContest.unk1920A_6 = 1; } -void sub_80DDB6C(u8 taskId) +static void sub_80DDB6C(u8 taskId) { struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId]; @@ -3940,7 +3936,7 @@ void sub_80DDB6C(u8 taskId) } } -void sub_80DDBE8(void) +static void sub_80DDBE8(void) { if (gSprites[sContest.applauseMeterSpriteId].invisible == TRUE) { @@ -3954,7 +3950,7 @@ void sub_80DDBE8(void) } } -void task08_080CD1CC(u8 taskId) +static void task08_080CD1CC(u8 taskId) { struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId]; @@ -3971,7 +3967,7 @@ void task08_080CD1CC(u8 taskId) } } -void sub_80DDCDC(s8 a) +static void sub_80DDCDC(s8 a) { u8 taskId = CreateTask(sub_80DDD20, 5); @@ -3979,7 +3975,7 @@ void sub_80DDCDC(s8 a) sContest.unk1920A_5 = 1; } -void sub_80DDD20(u8 taskId) +static void sub_80DDD20(u8 taskId) { switch (gTasks[taskId].data[10]) { @@ -4016,13 +4012,13 @@ void unref_sub_80DDDE4(void) gSprites[sContest.applauseMeterSpriteId].invisible = TRUE; } -void sub_80DDE0C(void) +static void sub_80DDE0C(void) { CreateTask(sub_80DDE30, 15); sContest.unk1920A_7 = 1; } -void sub_80DDE30(u8 taskId) +static void sub_80DDE30(u8 taskId) { if (gTasks[taskId].data[10]++ > 6) { @@ -4050,7 +4046,7 @@ void sub_80DDE30(u8 taskId) #define tBlendColor data[0] #define tBlendCoeff data[1] -void sub_80DDED0(s8 a, s8 b) +static void sub_80DDED0(s8 a, s8 b) { u8 taskId = CreateTask(sub_80DDF80, 10); u16 blendColor; @@ -4092,7 +4088,7 @@ void sub_80DDED0(s8 a, s8 b) sContest.unk1920B_0 = 0; } -void sub_80DDF80(u8 taskId) +static void sub_80DDF80(u8 taskId) { if (gTasks[taskId].data[10]++ >= 0) { @@ -4114,7 +4110,7 @@ void sub_80DDF80(u8 taskId) #undef tBlendColor #undef tBlendCoeff -void sub_80DE008(bool8 a) +static void sub_80DE008(bool8 a) { s32 i; @@ -4133,7 +4129,7 @@ void sub_80DE008(bool8 a) } } -const u8 *GetTurnOrderNumberGfx(u8 contestant) +static const u8 *GetTurnOrderNumberGfx(u8 contestant) { if (sContestantStatus[contestant].turnOrderMod != 1) return gContestNextTurnRandomGfx; @@ -4141,7 +4137,7 @@ const u8 *GetTurnOrderNumberGfx(u8 contestant) return gContestNextTurnNumbersGfx + sContestantStatus[contestant].nextTurnOrder * 32; } -void sub_80DE12C(void) +static void sub_80DE12C(void) { s32 r7 = 0; u8 r10 = 2; @@ -4171,7 +4167,7 @@ bool8 sub_80DE1E8(u8 a) return TRUE; } -void sub_80DE224(void) +static void sub_80DE224(void) { s32 i; u16 bg0Cnt, bg1Cnt, bg2Cnt; @@ -4209,7 +4205,7 @@ void sub_80DE224(void) } } -void sub_80DE350(void) +static void sub_80DE350(void) { s32 i; u16 bg1Cnt; @@ -4235,7 +4231,7 @@ void sub_80DE350(void) } } -void sub_80DE424(u8 taskId) +static void sub_80DE424(u8 taskId) { gBattle_BG1_X = 0; gBattle_BG1_Y = DISPLAY_HEIGHT; @@ -4243,7 +4239,7 @@ void sub_80DE424(u8 taskId) gTasks[taskId].func = sub_80DE464; } -void sub_80DE464(u8 taskId) +static void sub_80DE464(u8 taskId) { if ((s16)(gBattle_BG1_Y -= 7) < 0) gBattle_BG1_Y = 0; @@ -4256,7 +4252,7 @@ void sub_80DE464(u8 taskId) } } -void sub_80DE4A8(u8 taskId) +static void sub_80DE4A8(u8 taskId) { s32 i; @@ -4305,13 +4301,13 @@ void sub_80DE4A8(u8 taskId) } } -void sub_80DE5C0(u8 taskId) +static void sub_80DE5C0(u8 taskId) { if ((s16)(gBattle_BG1_Y += 7) > DISPLAY_HEIGHT) gTasks[taskId].func = sub_80DA4F4; } -void sub_80DE5F4(u8 taskId) +static void sub_80DE5F4(u8 taskId) { if (gTasks[taskId].data[2] < 10) { @@ -4342,7 +4338,7 @@ void sub_80DE5F4(u8 taskId) } } -void sub_80DE65C(u8 taskId) +static void sub_80DE65C(u8 taskId) { if (gTasks[taskId].data[2] < 10) { @@ -4356,7 +4352,7 @@ void sub_80DE65C(u8 taskId) } } -void sub_80DE69C(u8 a) +static void sub_80DE69C(u8 a) { s32 i; u8 taskId; @@ -4377,7 +4373,7 @@ void sub_80DE69C(u8 a) sContest.unk1920B_1 = 1; } -void sub_80DE794(u8 taskId) +static void sub_80DE794(u8 taskId) { s32 i; @@ -4395,21 +4391,21 @@ void sub_80DE794(u8 taskId) } } -u16 SanitizeMove(u16 move) +static u16 SanitizeMove(u16 move) { if (move >= MOVES_COUNT) move = MOVE_POUND; return move; } -u16 SanitizeSpecies(u16 species) +static u16 SanitizeSpecies(u16 species) { if (species >= NUM_SPECIES) species = SPECIES_NONE; return species; } -void sub_80DE864(u8 a) +static void sub_80DE864(u8 a) { s32 i; u16 move = SanitizeMove(sContestantStatus[a].currMove); @@ -4459,14 +4455,14 @@ void sub_80DE864(u8 a) sub_80DEA5C(); } -void sub_80DE9B0(u8 unused) +static void sub_80DE9B0(u8 unused) { memset(&gContestResources->field_18->species, 0, 0x14); if (sContest.unk1925E != 0) sContest.unk1925E--; } -void sub_80DE9DC(u8 a) +static void sub_80DE9DC(u8 a) { gContestResources->field_18->unk5 = a; gContestResources->field_18->species = SanitizeSpecies(gContestMons[a].species); @@ -4474,14 +4470,14 @@ void sub_80DE9DC(u8 a) gContestResources->field_18->unkC = gContestMons[a].otId; } -void sub_80DEA20(void) +static void sub_80DEA20(void) { gBattlerSpriteIds[3] = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); InitSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattlerTarget]]); sub_80DEA5C(); } -void sub_80DEA5C(void) +static void sub_80DEA5C(void) { struct Sprite *sprite = &gSprites[gBattlerSpriteIds[3]]; @@ -4492,7 +4488,7 @@ void sub_80DEA5C(void) sprite->invisible = TRUE; } -void SelectContestMoveBankTarget(u16 move) +static void SelectContestMoveBankTarget(u16 move) { switch (gBattleMoves[move].target) { @@ -4510,7 +4506,7 @@ void SelectContestMoveBankTarget(u16 move) } } -void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b) +static void Contest_PrintTextToBg0WindowStd(u32 a, const u8 *b) { struct TextPrinterTemplate printerTemplate; @@ -4556,7 +4552,7 @@ void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s3 Contest_SetBgCopyFlags(0); } -void Contest_StartTextPrinter(const u8 *currChar, bool32 b) +static void Contest_StartTextPrinter(const u8 *currChar, bool32 b) { struct TextPrinterTemplate printerTemplate; u8 speed; @@ -4592,24 +4588,24 @@ void Contest_StartTextPrinter(const u8 *currChar, bool32 b) Contest_SetBgCopyFlags(0); } -void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, s16 h) +static void ContestBG_FillBoxWithIncrementingTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g, s16 h) { WriteSequenceToBgTilemapBuffer(a, b, c, d, e, f, g, h); Contest_SetBgCopyFlags(a); } -void ContestBG_FillBoxWithTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g) +static void ContestBG_FillBoxWithTile(u8 a, u16 b, u8 c, u8 d, u8 e, u8 f, u8 g) { ContestBG_FillBoxWithIncrementingTile(a, b, c, d, e, f, g, 0); } -bool32 Contest_RunTextPrinters(void) +static bool32 Contest_RunTextPrinters(void) { RunTextPrinters(); return IsTextPrinterActive(4); } -void Contest_SetBgCopyFlags(u32 var) +static void Contest_SetBgCopyFlags(u32 var) { sContestBgCopyFlags |= 1 << var; } @@ -4726,3 +4722,467 @@ void ClearContestWinnerPicsInContestHall(void) for (i = 0; i < 8; i++) gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i]; } + +// The functions below are probably related to Contests in TV. +static void sub_80DF080(u8 contestant) +{ + s32 i; + + if (!gContestResources->field_10->excitementFrozen + && gContestResources->field_10->bits_0 > 0 + && !gContestResources->field_4[contestant].disappointedRepeat) + { + gContestResources->field_1c[contestant].unkC |= 1; + gContestResources->field_1c[contestant].unkE_2 = 1; + } + + if (gContestResources->field_4[contestant].nervous) + gContestResources->field_1c[contestant].unkC |= 2; + + if (!gContestResources->field_10->excitementFrozen + && gContestResources->field_10->bits_0 != 0 + && gContestResources->field_10->unk2 == 60) + { + gContestResources->field_1c[contestant].unkC |= 4; + } + + if (gContestResources->field_4[contestant].unk15_6 + && gContestResources->field_4[contestant].unk16 != 0) + { + gContestResources->field_1c[contestant].unkC |= 8; + } + + for (i = 0; i < 4; i++) + { + if (i != contestant && gContestResources->field_4[i].jam != 0) + { + gContestResources->field_1c[contestant].unkC |= 0x10; + gContestResources->field_1c[i].unkC |= 0x40; + } + } + + if (gContestResources->field_4[contestant].numTurnsSkipped != 0 + || gContestResources->field_4[contestant].noMoreTurns) + { + gContestResources->field_1c[contestant].unkC |= 0x20; + } + else if (!gContestResources->field_4[contestant].nervous) + { + gContestResources->field_1c[contestant].unkC |= 0x80; + gContestResources->field_1c[contestant].unkE_1 = 1; + gContestResources->field_1c[contestant].unk0[gContestResources->field_0->turnNumber] = gContestResources->field_4[contestant].currMove; + } + + if (gContestResources->field_4[contestant].disappointedRepeat) + gContestResources->field_1c[contestant].unkD |= 2; + + if (gContestResources->field_0->applauseLevel == 4 + && !gContestResources->field_10->excitementFrozen + && gContestResources->field_10->bits_0 < 0) + { + gContestResources->field_1c[contestant].unkD |= 0x20; + } +} + +static void sub_80DF250(void) +{ + u8 r1; + s32 i, j; + bool32 r12, r8; + u16 sp0[6]; + u8 spC[6]; + u16 sp14[5]; + u8 var_38; + u8 r3; + u8 count; + + r1 = 0; + var_38 = 0; + + for (i = 0; i < 4; i++) + { + if (gContestFinalStandings[i] == 0) + var_38 = i; + else if (gContestFinalStandings[i] == 3) + r1 = i; + } + + gContestResources->field_1c[r1].unkD |= 1; + for (i = 0; i < 4; i++) + { + if (i != var_38 && gUnknown_02039F08[var_38] - gUnknown_02039F08[i] <= 50) + gContestResources->field_1c[i].unkD |= 4; + + if (!gContestResources->field_1c[i].unkE_2) + gContestResources->field_1c[i].unkD |= 8; + + for (j = 0; j < 4; j++) + { + if (gContestMonConditions[i] < gContestMonConditions[j]) + break; + } + if (j == 4 && gContestFinalStandings[i] != 0) + gContestResources->field_1c[i].unkD |= 0x10; + + r12 = FALSE; + r8 = FALSE; + for (j = 0; j < 4; j++) + { + if (gContestMonConditions[i] > gContestMonConditions[j]) + r12 = TRUE; + if (gUnknown_02039F18[i] > gUnknown_02039F18[j]) + r8 = TRUE; + } + if (!r12 && !r8) + gContestResources->field_1c[i].unkD |= 0x40; + + if (!gContestResources->field_1c[i].unkE_1) + gContestResources->field_1c[i].unkD |= 0x80; + } + + for (i = 0; i < 5; i++) + { + sp0[i] = 0; + spC[i] = 0; + } + sp0[5] = 0xFFFF; + spC[5] = 0; + + for (i = 0; i < 5; i++) + { + if (gContestResources->field_1c[var_38].unk0[i] != 0) + { + for (j = 0; j < 5; j++) + { + if (gContestResources->field_1c[var_38].unk0[i] != sp0[j]) + { + if (sp0[j] == 0) + { + sp0[j] = gContestResources->field_1c[var_38].unk0[i]; + spC[j]++; + } + } + else + { + spC[j]++; + } + } + } + } + + sp14[0] = sp0[0]; + r3 = spC[0]; + count = 0; + for (i = 1; sp0[i] != 0xFFFF; i++) + { + if (r3 < spC[i]) + { + sp14[0] = sp0[i]; + r3 = spC[i]; + count = 1; + } + else if (r3 == spC[i]) + { + sp14[count] = sp0[i]; + count++; + } + } + + gContestResources->field_1c[var_38].unkA = sp14[Random() % count]; +} + +static void sub_80DF4F8(void) +{ + s32 i; + u32 bits; + u8 r7; + u8 r9, r10; + u8 count; + u8 r5; + u8 r2; + u16 var; + u8 r4; + u8 r6; + u8 sp0[4]; + + if (gContestFinalStandings[gContestPlayerMonIndex] != 0) + return; + + r7 = 0; + for (i = 0; i < 4; i++) + { + if (gContestFinalStandings[i] == 0) + r7 = i; + } + + r9 = 0; + r10 = 0; + for (i = 0; i < 4; i++) + { + if (gContestMonConditions[r7] < gContestMonConditions[i]) + r9++; + if (gUnknown_02039F18[r7] < gUnknown_02039F18[i]) + r10++; + } + + bits = gContestResources->field_1c[r7].unkC; + count = 0; + for (i = 0; i < 8; bits >>= 1, i++) + { + if (bits & 1) + count++; + } + + r5 = Random() % count; + bits = gContestResources->field_1c[r7].unkC; + count = 0; + r2 = 0; + for (i = 0; i < 8; bits >>= 1, r2++, i++) + { + if (!(bits & 1)) + continue; + if (r5 == count) + break; + count++; + } + + var = 1 << r2; + if (r7 == 0) + { + sp0[0] = 1; + r4 = gContestResources->field_1c[1].unkD; + i = 2; + } + else + { + sp0[0] = 0; + r4 = gContestResources->field_1c[0].unkD; + i = 1; + } + + r5 = 1; + for (; i < 4; i++) + { + if (i != r7) + { + if (r4 < gContestResources->field_1c[i].unkD) + { + sp0[0] = i; + r4 = gContestResources->field_1c[i].unkD; + r5 = 1; + } + else if (r4 == gContestResources->field_1c[i].unkD) + { + sp0[r5] = i; + r5++; + } + } + } + + r6 = sp0[Random() % r5]; + r2 = 0x80; + for (i = 0; i < 8; r2 >>= 1, i++) + { + r4 = gContestResources->field_1c[r6].unkD & r2; + if (r4) + break; + } + + ContestLiveUpdates_BeforeInterview_1(r9); + ContestLiveUpdates_BeforeInterview_2(r10); + ContestLiveUpdates_BeforeInterview_3(var); + ContestLiveUpdates_BeforeInterview_4(gContestResources->field_1c[r7].unkA); + ContestLiveUpdates_BeforeInterview_5(r4, r6); +} + +// Unused +void sub_80DF704(u8 arg0) +{ + if (gHeap[0x1A000] == 0) + { + if (arg0 == 0) + gHeap[0x1A000] = 2; + else + gHeap[0x1A000] = 3; + } + else + { + gHeap[0x1A000] = 0; + } + + if (gHeap[0x1A000] == 0) + { + sub_80DAEA4(); + sub_80DB2BC(); + } + else + { + sub_80DF750(); + } +} + +static void sub_80DF750(void) +{ + u8 i; + s8 j; + u8 text1[20]; + u8 text2[20]; + u8 *txtPtr; + u32 bits; + + if (gUnknown_020322D5 == 0) + return; + if (gHeap[0x1A000] != 2 && gHeap[0x1A000] != 3) + return; + + for (i = 0; i < 4; i++) + FillWindowPixelBuffer(i, 0); + + if (gHeap[0x1A000] == 2) + { + for (i = 0; i < 4; i++) + { + txtPtr = StringCopy(text1, gText_CDot); + Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text1, 5, 1, 7); + bits = gContestResources->field_1c[i].unkC; + for (j = 7; j > -1; j--) // Weird loop. + { + txtPtr = ConvertIntToDecimalStringN(txtPtr, bits & 1, STR_CONV_MODE_LEFT_ALIGN, 1); + bits >>= 1; + } + + for (j = 0; j < 5; j++) + text2[j] = text1[j]; + + text2[j] = EOS; + Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text2, 5, 1, 7); + Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text1 + j, 55, 1, 7); + } + } + else + { + for (i = 0; i < 4; i++) + { + StringCopy(text1, gText_BDot); + bits = gContestResources->field_1c[i].unkD; + txtPtr = &text1[2]; + for (j = 7; j > -1; j--) // Weird loop. + { + txtPtr = ConvertIntToDecimalStringN(txtPtr, bits & 1, STR_CONV_MODE_LEFT_ALIGN, 1); + bits >>= 1; + } + + for (j = 0; j < 5; j++) + text2[j] = text1[j]; + + text2[j] = EOS; + Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text2, 5, 1, 7); + Contest_PrintTextToBg0WindowAt(gUnknown_02039F26[i], text1 + j, 55, 1, 7); + } + } + sub_80DB2BC(); +} + +static u8 sub_80DF940(u8 *nickname) +{ + u8 ret = GAME_LANGUAGE; + + if (nickname[0] == EXT_CTRL_CODE_BEGIN && nickname[1] == EXT_CTRL_CODE_JPN) + return LANGUAGE_ENGLISH; + + if (StringLength(nickname) < 6) + { + while (*nickname != EOS) + { + if ((*nickname >= CHAR_A && *nickname <= CHAR_z) + || (*nickname >= CHAR_0 && *nickname <= CHAR_9) + || *nickname == CHAR_SPACE + || *nickname == CHAR_PERIOD + || *nickname == CHAR_COMMA + || *nickname == CHAR_EXCL_MARK + || *nickname == CHAR_QUESTION_MARK + || *nickname == CHAR_MALE + || *nickname == CHAR_FEMALE + || *nickname == CHAR_SLASH + || *nickname == CHAR_HYPHEN + || *nickname == CHAR_ELLIPSIS + || *nickname == CHAR_DOUBLE_QUOTATION_LEFT + || *nickname == CHAR_DOUBLE_QUOTATION_RIGHT + || *nickname == CHAR_SINGLE_QUOTATION_LEFT + || *nickname == CHAR_DOUBLE_QUOTATION_LEFT) // Most likely a typo, CHAR_SINGLE_QUOTATION_RIGHT should be here instead. + { + nickname++; + } + else + { + ret = LANGUAGE_JAPANESE; + break; + } + } + } + + return ret; +} + +static void sub_80DF9D4(u8 *playerName) +{ + u8 chr = playerName[5]; + + playerName[5] = EOS; + playerName[PLAYER_NAME_LENGTH] = chr; +} + +static void sub_80DF9E0(u8 *monName, s32 language) +{ + u8 chr; + + StripExtCtrlCodes(monName); + if (language == LANGUAGE_JAPANESE) + { + monName[5] = EOS; + monName[POKEMON_NAME_LENGTH] = EXT_CTRL_CODE_BEGIN; + } + else + { + chr = monName[5]; + monName[5] = EOS; + monName[POKEMON_NAME_LENGTH] = chr; + } +} + +void sub_80DFA08(struct ContestPokemon *mon, s32 language) +{ + u8 *name = mon->nickname; + + if (language == LANGUAGE_JAPANESE) + { + ConvertInternationalString(name, sub_80DF940(name)); + } + else if (name[POKEMON_NAME_LENGTH] == EXT_CTRL_CODE_BEGIN) + { + ConvertInternationalString(name, LANGUAGE_JAPANESE); + } + else + { + name[5] = name[POKEMON_NAME_LENGTH]; + name[POKEMON_NAME_LENGTH] = EOS; + } + + name = mon->trainerName; + if (language == LANGUAGE_JAPANESE) + { + name[PLAYER_NAME_LENGTH] = EOS; + name[6] = name[4]; + name[5] = name[3]; + name[4] = name[2]; + name[3] = name[1]; + name[2] = mon->trainerName[0]; + name[1] = EXT_CTRL_CODE_JPN; + name[0] = EXT_CTRL_CODE_BEGIN; + } + else + { + name[5] = name[PLAYER_NAME_LENGTH]; + name[PLAYER_NAME_LENGTH] = EOS; + } +} From 922726ff3d5c5257881d305dd72650b6a76b8995 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 28 Jan 2019 18:19:58 +0100 Subject: [PATCH 11/42] contest --- src/contest.c | 1738 ++++++++++++++++++++++++------------------------- 1 file changed, 869 insertions(+), 869 deletions(-) diff --git a/src/contest.c b/src/contest.c index 799a190303..5b7363ec05 100644 --- a/src/contest.c +++ b/src/contest.c @@ -451,54 +451,54 @@ void sub_80D7B24(void) { switch (gMain.state) { - case 0: - sContestBgCopyFlags = 0; - sub_80D7988(); - AllocateMonSpritesGfx(); - FREE_AND_SET_NULL(gMonSpritesGfxPtr->firstDecompressed); - gMonSpritesGfxPtr->firstDecompressed = AllocZeroed(0x4000); - SetVBlankCallback(NULL); - sub_80D779C(); - sub_80D77E4(); - sub_80D7678(); - ScanlineEffect_Clear(); - ResetPaletteFade(); - gPaletteFade.bufferTransferDisabled = TRUE; - ResetSpriteData(); - ResetTasks(); - FreeAllSpritePalettes(); - gReservedSpritePaletteCount = 4; - //shared18000.unk18000 = 0; - gHeap[0x1a000] = 0; - ClearBattleMonForms(); - sub_80D787C(); + case 0: + sContestBgCopyFlags = 0; + sub_80D7988(); + AllocateMonSpritesGfx(); + FREE_AND_SET_NULL(gMonSpritesGfxPtr->firstDecompressed); + gMonSpritesGfxPtr->firstDecompressed = AllocZeroed(0x4000); + SetVBlankCallback(NULL); + sub_80D779C(); + sub_80D77E4(); + sub_80D7678(); + ScanlineEffect_Clear(); + ResetPaletteFade(); + gPaletteFade.bufferTransferDisabled = TRUE; + ResetSpriteData(); + ResetTasks(); + FreeAllSpritePalettes(); + gReservedSpritePaletteCount = 4; + //shared18000.unk18000 = 0; + gHeap[0x1a000] = 0; + ClearBattleMonForms(); + sub_80D787C(); + gMain.state++; + break; + case 1: + gMain.state++; + break; + case 2: + if (sub_80D7E44(&gContestResources->field_0->unk1925D)) + { + gContestResources->field_0->unk1925D = 0; gMain.state++; - break; - case 1: - gMain.state++; - break; - case 2: - if (sub_80D7E44(&gContestResources->field_0->unk1925D)) - { - gContestResources->field_0->unk1925D = 0; - gMain.state++; - } - break; - case 3: - sub_80DE224(); - gBattle_BG1_X = 0; - gBattle_BG1_Y = 0; - BeginFastPaletteFade(2); - gPaletteFade.bufferTransferDisabled = FALSE; - SetVBlankCallback(vblank_cb_battle); - gContestResources->field_0->mainTaskId = CreateTask(sub_80D7C7C, 10); - SetMainCallback2(sub_80D823C); - if (gIsLinkContest & 2) - { - sub_800E0E8(); - CreateWirelessStatusIndicatorSprite(8, 8); - } - break; + } + break; + case 3: + sub_80DE224(); + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + BeginFastPaletteFade(2); + gPaletteFade.bufferTransferDisabled = FALSE; + SetVBlankCallback(vblank_cb_battle); + gContestResources->field_0->mainTaskId = CreateTask(sub_80D7C7C, 10); + SetMainCallback2(sub_80D823C); + if (gIsLinkContest & 2) + { + sub_800E0E8(); + CreateWirelessStatusIndicatorSprite(8, 8); + } + break; } } @@ -519,22 +519,22 @@ static void sub_80D7CB4(u8 taskId) { switch (gTasks[taskId].data[0]) { - case 0: - sub_80DBF68(); + case 0: + sub_80DBF68(); + gTasks[taskId].data[0]++; + // fallthrough + case 1: + if (IsLinkTaskFinished()) + { + sub_800ADF8(); gTasks[taskId].data[0]++; - // fallthrough - case 1: - if (IsLinkTaskFinished()) - { - sub_800ADF8(); - gTasks[taskId].data[0]++; - } + } + return; + case 2: + if (IsLinkTaskFinished() != TRUE) return; - case 2: - if (IsLinkTaskFinished() != TRUE) - return; - gTasks[taskId].data[0]++; - break; + gTasks[taskId].data[0]++; + break; } } @@ -584,67 +584,67 @@ static u8 sub_80D7E44(u8 *a) switch (*a) { - case 0: - gPaletteFade.bufferTransferDisabled = TRUE; - RequestDma3Fill(0, (void *)VRAM, 0x8000, 1); - RequestDma3Fill(0, (void *)VRAM + 0x8000, 0x8000, 1); - RequestDma3Fill(0, (void *)VRAM + 0x10000, 0x8000, 1); - break; - case 1: - LZDecompressVram(gContestMiscGfx, (void *)VRAM); - break; - case 2: - LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000)); - DmaCopyLarge32(3, (void *)(VRAM + 0x2000), shared15800, 0x2000, 0x1000); - break; - case 3: - CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0); - CopyBgTilemapBufferToVram(3); - break; - case 4: - CopyToBgTilemapBuffer(2, gUnknown_08C17170, 0, 0); - CopyBgTilemapBufferToVram(2); - DmaCopy32Defvars(3, gContestResources->field_24[2], shared18000.unk18A04, 0x800); - break; - case 5: - LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200); - CpuCopy32(gPlttBufferUnfaded + 128, sp0, 16 * sizeof(u16)); - CpuCopy32(gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, sp20, 16 * sizeof(u16)); - CpuCopy32(sp20, gPlttBufferUnfaded + 128, 16 * sizeof(u16)); - CpuCopy32(sp0, gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, 16 * sizeof(u16)); - DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18004, 0x200); - sub_80D782C(); - break; - case 6: - sub_80DD04C(); - sub_80DBF90(); - sub_80DB2BC(); - gContestResources->field_0->unk19216 = sub_80DB120(); - sub_80DC2BC(); - sub_80DC4F0(); - CreateApplauseMeterSprite(); - sub_80DC5E8(); - sub_80DC7EC(); - gBattlerPositions[0] = 0; - gBattlerPositions[1] = 1; - gBattlerPositions[2] = 3; - gBattlerPositions[3] = 2; - gBattleTypeFlags = 0; - gBattlerAttacker = 2; - gBattlerTarget = 3; - gBattlerSpriteIds[gBattlerAttacker] = sub_80DB0C4(); - sub_80DEA20(); - CopyBgTilemapBufferToVram(3); - CopyBgTilemapBufferToVram(2); - CopyBgTilemapBufferToVram(1); - ShowBg(3); - ShowBg(2); - ShowBg(0); - ShowBg(1); - break; - default: - *a = 0; - return 1; + case 0: + gPaletteFade.bufferTransferDisabled = TRUE; + RequestDma3Fill(0, (void *)VRAM, 0x8000, 1); + RequestDma3Fill(0, (void *)VRAM + 0x8000, 0x8000, 1); + RequestDma3Fill(0, (void *)VRAM + 0x10000, 0x8000, 1); + break; + case 1: + LZDecompressVram(gContestMiscGfx, (void *)VRAM); + break; + case 2: + LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000)); + DmaCopyLarge32(3, (void *)(VRAM + 0x2000), shared15800, 0x2000, 0x1000); + break; + case 3: + CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0); + CopyBgTilemapBufferToVram(3); + break; + case 4: + CopyToBgTilemapBuffer(2, gUnknown_08C17170, 0, 0); + CopyBgTilemapBufferToVram(2); + DmaCopy32Defvars(3, gContestResources->field_24[2], shared18000.unk18A04, 0x800); + break; + case 5: + LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200); + CpuCopy32(gPlttBufferUnfaded + 128, sp0, 16 * sizeof(u16)); + CpuCopy32(gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, sp20, 16 * sizeof(u16)); + CpuCopy32(sp20, gPlttBufferUnfaded + 128, 16 * sizeof(u16)); + CpuCopy32(sp0, gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, 16 * sizeof(u16)); + DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18004, 0x200); + sub_80D782C(); + break; + case 6: + sub_80DD04C(); + sub_80DBF90(); + sub_80DB2BC(); + gContestResources->field_0->unk19216 = sub_80DB120(); + sub_80DC2BC(); + sub_80DC4F0(); + CreateApplauseMeterSprite(); + sub_80DC5E8(); + sub_80DC7EC(); + gBattlerPositions[0] = 0; + gBattlerPositions[1] = 1; + gBattlerPositions[2] = 3; + gBattlerPositions[3] = 2; + gBattleTypeFlags = 0; + gBattlerAttacker = 2; + gBattlerTarget = 3; + gBattlerSpriteIds[gBattlerAttacker] = sub_80DB0C4(); + sub_80DEA20(); + CopyBgTilemapBufferToVram(3); + CopyBgTilemapBufferToVram(2); + CopyBgTilemapBufferToVram(1); + ShowBg(3); + ShowBg(2); + ShowBg(0); + ShowBg(1); + break; + default: + *a = 0; + return 1; } (*a)++; @@ -666,43 +666,43 @@ static void sub_80D8108(u8 taskId) { switch (gTasks[taskId].data[0]) { - case 0: - if (gTasks[taskId].data[1]++ <= 60) - break; - gTasks[taskId].data[1] = 0; - PlaySE12WithPanning(SE_C_MAKU_U, 0); - gTasks[taskId].data[0]++; + case 0: + if (gTasks[taskId].data[1]++ <= 60) break; - case 1: - (s16)gBattle_BG1_Y += 7; - if ((s16)gBattle_BG1_Y <= 160) - break; - gTasks[taskId].data[0]++; + gTasks[taskId].data[1] = 0; + PlaySE12WithPanning(SE_C_MAKU_U, 0); + gTasks[taskId].data[0]++; + break; + case 1: + (s16)gBattle_BG1_Y += 7; + if ((s16)gBattle_BG1_Y <= 160) break; - case 2: - sub_80DE350(); - gTasks[taskId].data[0]++; - break; - case 3: - { - u16 bg0Cnt = GetGpuReg(REG_OFFSET_BG0CNT); - u16 bg2Cnt = GetGpuReg(REG_OFFSET_BG2CNT); - ((struct BgCnt *)&bg0Cnt)->priority = 0; - ((struct BgCnt *)&bg2Cnt)->priority = 0; - SetGpuReg(REG_OFFSET_BG0CNT, bg0Cnt); - SetGpuReg(REG_OFFSET_BG2CNT, bg2Cnt); - sub_80DDB0C(); - gTasks[taskId].data[0]++; - break; - } - case 4: - default: - if (gContestResources->field_0->unk1920A_6) - break; - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[1] = 0; - gTasks[taskId].func = sub_80D833C; + gTasks[taskId].data[0]++; + break; + case 2: + sub_80DE350(); + gTasks[taskId].data[0]++; + break; + case 3: + { + u16 bg0Cnt = GetGpuReg(REG_OFFSET_BG0CNT); + u16 bg2Cnt = GetGpuReg(REG_OFFSET_BG2CNT); + ((struct BgCnt *)&bg0Cnt)->priority = 0; + ((struct BgCnt *)&bg2Cnt)->priority = 0; + SetGpuReg(REG_OFFSET_BG0CNT, bg0Cnt); + SetGpuReg(REG_OFFSET_BG2CNT, bg2Cnt); + sub_80DDB0C(); + gTasks[taskId].data[0]++; + break; + } + case 4: + default: + if (gContestResources->field_0->unk1920A_6) break; + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + gTasks[taskId].func = sub_80D833C; + break; } } @@ -846,46 +846,46 @@ static void sub_80D8610(u8 taskId) { switch (gMain.newAndRepeatedKeys) { - case B_BUTTON: + case B_BUTTON: + PlaySE(SE_SELECT); + sub_80DC490(FALSE); + ConvertIntToDecimalStringN(gStringVar1, gContestResources->field_0->turnNumber + 1, STR_CONV_MODE_LEFT_ALIGN, 1); + if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex)) + StringCopy(gDisplayedStringBattle, gText_0827D507); + else + StringCopy(gDisplayedStringBattle, gText_0827D531); + sub_80DB89C(); + StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); + Contest_StartTextPrinter(gStringVar4, 0); + gBattle_BG0_Y = 0; + gBattle_BG2_Y = 0; + gTasks[taskId].func = sub_80D8424; + break; + case DPAD_LEFT: + case DPAD_RIGHT: + break; + case DPAD_UP: + sub_80D883C(gContestResources->field_0->playerMoveChoice); + if (gContestResources->field_0->playerMoveChoice == 0) + gContestResources->field_0->playerMoveChoice = numMoves - 1; + else + gContestResources->field_0->playerMoveChoice--; + sub_80D880C(gContestResources->field_0->playerMoveChoice); + prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]); + if (numMoves > 1) PlaySE(SE_SELECT); - sub_80DC490(FALSE); - ConvertIntToDecimalStringN(gStringVar1, gContestResources->field_0->turnNumber + 1, STR_CONV_MODE_LEFT_ALIGN, 1); - if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex)) - StringCopy(gDisplayedStringBattle, gText_0827D507); - else - StringCopy(gDisplayedStringBattle, gText_0827D531); - sub_80DB89C(); - StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); - Contest_StartTextPrinter(gStringVar4, 0); - gBattle_BG0_Y = 0; - gBattle_BG2_Y = 0; - gTasks[taskId].func = sub_80D8424; - break; - case DPAD_LEFT: - case DPAD_RIGHT: - break; - case DPAD_UP: - sub_80D883C(gContestResources->field_0->playerMoveChoice); - if (gContestResources->field_0->playerMoveChoice == 0) - gContestResources->field_0->playerMoveChoice = numMoves - 1; - else - gContestResources->field_0->playerMoveChoice--; - sub_80D880C(gContestResources->field_0->playerMoveChoice); - prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]); - if (numMoves > 1) - PlaySE(SE_SELECT); - break; - case DPAD_DOWN: - sub_80D883C(gContestResources->field_0->playerMoveChoice); - if (gContestResources->field_0->playerMoveChoice == numMoves - 1) - gContestResources->field_0->playerMoveChoice = 0; - else - gContestResources->field_0->playerMoveChoice++; - sub_80D880C(gContestResources->field_0->playerMoveChoice); - prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]); - if (numMoves > 1) - PlaySE(SE_SELECT); - break; + break; + case DPAD_DOWN: + sub_80D883C(gContestResources->field_0->playerMoveChoice); + if (gContestResources->field_0->playerMoveChoice == numMoves - 1) + gContestResources->field_0->playerMoveChoice = 0; + else + gContestResources->field_0->playerMoveChoice++; + sub_80D880C(gContestResources->field_0->playerMoveChoice); + prints_contest_move_description(gContestMons[gContestPlayerMonIndex].moves[gContestResources->field_0->playerMoveChoice]); + if (numMoves > 1) + PlaySE(SE_SELECT); + break; } } } @@ -1001,100 +1001,100 @@ static void sub_80D8B38(u8 taskId) switch (gTasks[taskId].data[0]) { - case 0: - sub_80DCD48(); - for (i = 0; gContestResources->field_0->unk19214 != gContestResources->field_8->turnOrder[i]; i++) - ; - gContestResources->field_0->unk19215 = i; - r6 = gContestResources->field_0->unk19215; - if (gIsLinkContest & 1) - { - u8 taskId2; + case 0: + sub_80DCD48(); + for (i = 0; gContestResources->field_0->unk19214 != gContestResources->field_8->turnOrder[i]; i++) + ; + gContestResources->field_0->unk19215 = i; + r6 = gContestResources->field_0->unk19215; + if (gIsLinkContest & 1) + { + u8 taskId2; - gContestResources->field_0->unk1920B_2 = 1; - if (sub_80DA8A4()) - sub_80DD080(gContestResources->field_0->unk19215); - taskId2 = CreateTask(sub_80FCC88, 0); - SetTaskFuncWithFollowupFunc(taskId2, sub_80FCC88, sub_80DA110); - sub_80DBF68(); - gTasks[taskId].data[0] = 1; - } - else - { + gContestResources->field_0->unk1920B_2 = 1; + if (sub_80DA8A4()) sub_80DD080(gContestResources->field_0->unk19215); - gTasks[taskId].data[0] = 2; - } - return; - case 1: - if (!gContestResources->field_0->unk1920B_2) - gTasks[taskId].data[0] = 2; - return; - case 2: - sub_80DF080(r6); - sub_80DF750(); - if (gContestResources->field_4[r6].numTurnsSkipped != 0 - || gContestResources->field_4[r6].noMoreTurns) - { - gTasks[taskId].data[0] = 31; - } + taskId2 = CreateTask(sub_80FCC88, 0); + SetTaskFuncWithFollowupFunc(taskId2, sub_80FCC88, sub_80DA110); + sub_80DBF68(); + gTasks[taskId].data[0] = 1; + } + else + { + sub_80DD080(gContestResources->field_0->unk19215); + gTasks[taskId].data[0] = 2; + } + return; + case 1: + if (!gContestResources->field_0->unk1920B_2) + gTasks[taskId].data[0] = 2; + return; + case 2: + sub_80DF080(r6); + sub_80DF750(); + if (gContestResources->field_4[r6].numTurnsSkipped != 0 + || gContestResources->field_4[r6].noMoreTurns) + { + gTasks[taskId].data[0] = 31; + } + else + { + sub_80DB89C(); + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 3; + } + return; + case 3: + for (i = 0; i < 4; i++) + gBattleMonForms[i] = 0; + memset(gContestResources->field_18, 0, sizeof(*gContestResources->field_18)); + sub_80DE9DC(gContestResources->field_0->unk19215); + spriteId = sub_80DB174( + gContestMons[gContestResources->field_0->unk19215].species, + gContestMons[gContestResources->field_0->unk19215].otId, + gContestMons[gContestResources->field_0->unk19215].personality, + gContestResources->field_0->unk19215); + gSprites[spriteId].pos2.x = 120; + gSprites[spriteId].callback = sub_80DA134; + gTasks[taskId].data[2] = spriteId; + gBattlerSpriteIds[gBattlerAttacker] = spriteId; + sub_80DCBE8(sub_80DC9EC(gContestResources->field_0->unk19215), FALSE); + gTasks[taskId].data[0] = 4; + return; + case 4: + spriteId = gTasks[taskId].data[2]; + if (gSprites[spriteId].callback == SpriteCallbackDummy) + { + if (!gContestResources->field_14[r6].unk2_1) + gTasks[taskId].data[0] = 5; + } + return; + case 5: + if (gContestResources->field_4[r6].nervous) + { + gTasks[taskId].data[0] = 33; + } + else + { + sub_80DB89C(); + StringCopy(gStringVar1, gContestMons[r6].nickname); + if (gContestResources->field_4[r6].currMove < MOVES_COUNT) + StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]); else - { - sub_80DB89C(); - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 3; - } - return; - case 3: - for (i = 0; i < 4; i++) - gBattleMonForms[i] = 0; - memset(gContestResources->field_18, 0, sizeof(*gContestResources->field_18)); - sub_80DE9DC(gContestResources->field_0->unk19215); - spriteId = sub_80DB174( - gContestMons[gContestResources->field_0->unk19215].species, - gContestMons[gContestResources->field_0->unk19215].otId, - gContestMons[gContestResources->field_0->unk19215].personality, - gContestResources->field_0->unk19215); - gSprites[spriteId].pos2.x = 120; - gSprites[spriteId].callback = sub_80DA134; - gTasks[taskId].data[2] = spriteId; - gBattlerSpriteIds[gBattlerAttacker] = spriteId; - sub_80DCBE8(sub_80DC9EC(gContestResources->field_0->unk19215), FALSE); - gTasks[taskId].data[0] = 4; - return; - case 4: - spriteId = gTasks[taskId].data[2]; - if (gSprites[spriteId].callback == SpriteCallbackDummy) - { - if (!gContestResources->field_14[r6].unk2_1) - gTasks[taskId].data[0] = 5; - } - return; - case 5: - if (gContestResources->field_4[r6].nervous) - { - gTasks[taskId].data[0] = 33; - } - else - { - sub_80DB89C(); - StringCopy(gStringVar1, gContestMons[r6].nickname); - if (gContestResources->field_4[r6].currMove < MOVES_COUNT) - StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]); - else - StringCopy(gStringVar2, gUnknown_08587F1C[gContestResources->field_4[r6].moveCategory]); - StringExpandPlaceholders(gStringVar4, gText_0827D55A); - Contest_StartTextPrinter(gStringVar4, 1); - gTasks[taskId].data[0] = 6; - } - return; - case 6: - if (!Contest_RunTextPrinters()) - { - gContestResources->field_0->unk1925E = 0; - gTasks[taskId].data[0] = 7; - } - return; - case 7: + StringCopy(gStringVar2, gUnknown_08587F1C[gContestResources->field_4[r6].moveCategory]); + StringExpandPlaceholders(gStringVar4, gText_0827D55A); + Contest_StartTextPrinter(gStringVar4, 1); + gTasks[taskId].data[0] = 6; + } + return; + case 6: + if (!Contest_RunTextPrinters()) + { + gContestResources->field_0->unk1925E = 0; + gTasks[taskId].data[0] = 7; + } + return; + case 7: { u16 move = SanitizeMove(gContestResources->field_4[gContestResources->field_0->unk19215].currMove); @@ -1104,144 +1104,144 @@ static void sub_80D8B38(u8 taskId) DoMoveAnim(move); gTasks[taskId].data[0] = 8; } - return; - case 8: - gAnimScriptCallback(); - if (!gAnimScriptActive) - { - sub_80DE9B0(r6); - if (gContestResources->field_0->unk1925E != 0) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 9; - } - else - { - if (!gContestResources->field_4[r6].hasJudgesAttention) - sub_80DC674(r6); - sub_80DE12C(); - gTasks[taskId].data[0] = 23; - } - } - return; - case 9: - if (gTasks[taskId].data[10]++ > 30) + return; + case 8: + gAnimScriptCallback(); + if (!gAnimScriptActive) + { + sub_80DE9B0(r6); + if (gContestResources->field_0->unk1925E != 0) { gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 7; - } - return; - case 23: - gTasks[taskId].data[1] = 0; - if (gContestResources->field_4[r6].effectStringId != CONTEST_STRING_NONE) - { - sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId); - gContestResources->field_4[r6].effectStringId = CONTEST_STRING_NONE; - gTasks[taskId].data[0] = 24; + gTasks[taskId].data[0] = 9; } else { - if (gContestResources->field_4[r6].effectStringId2 != CONTEST_STRING_NONE) + if (!gContestResources->field_4[r6].hasJudgesAttention) + sub_80DC674(r6); + sub_80DE12C(); + gTasks[taskId].data[0] = 23; + } + } + return; + case 9: + if (gTasks[taskId].data[10]++ > 30) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 7; + } + return; + case 23: + gTasks[taskId].data[1] = 0; + if (gContestResources->field_4[r6].effectStringId != CONTEST_STRING_NONE) + { + sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId); + gContestResources->field_4[r6].effectStringId = CONTEST_STRING_NONE; + gTasks[taskId].data[0] = 24; + } + else + { + if (gContestResources->field_4[r6].effectStringId2 != CONTEST_STRING_NONE) + { + for (i = 0; i < 4; i++) { - for (i = 0; i < 4; i++) - { - if (i != r6 && gContestResources->field_4[i].effectStringId != CONTEST_STRING_NONE) - break; - } - if (i == 4) - { - sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId2); - gContestResources->field_4[r6].effectStringId2 = CONTEST_STRING_NONE; - gTasks[taskId].data[0] = 24; - } - else - { - gTasks[taskId].data[0] = 48; - } + if (i != r6 && gContestResources->field_4[i].effectStringId != CONTEST_STRING_NONE) + break; + } + if (i == 4) + { + sub_80DD45C(r6, gContestResources->field_4[r6].effectStringId2); + gContestResources->field_4[r6].effectStringId2 = CONTEST_STRING_NONE; + gTasks[taskId].data[0] = 24; } else { gTasks[taskId].data[0] = 48; } } - return; - case 24: - if (!Contest_RunTextPrinters()) - gTasks[taskId].data[0] = 23; - return; - case 48: - if (gContestResources->field_4[r6].turnOrderModAction == 1) - { - sub_80DD720(5); - } - else if (gContestResources->field_4[r6].turnOrderModAction == 2) - { - sub_80DD720(6); - } - else if (gContestResources->field_4[r6].turnOrderModAction == 3) - { - sub_80DD720(7); - } else { - gTasks[taskId].data[0] = 47; - return; + gTasks[taskId].data[0] = 48; } - gTasks[taskId].data[0] = 49; + } + return; + case 24: + if (!Contest_RunTextPrinters()) + gTasks[taskId].data[0] = 23; + return; + case 48: + if (gContestResources->field_4[r6].turnOrderModAction == 1) + { + sub_80DD720(5); + } + else if (gContestResources->field_4[r6].turnOrderModAction == 2) + { + sub_80DD720(6); + } + else if (gContestResources->field_4[r6].turnOrderModAction == 3) + { + sub_80DD720(7); + } + else + { + gTasks[taskId].data[0] = 47; return; - case 49: - if (!gContestResources->field_0->unk1920A_4) - gTasks[taskId].data[0] = 47; - return; - case 47: - sub_80DE008(TRUE); - gTasks[taskId].data[0] = 12; - return; - case 12: - sub_80DC028(0, gContestResources->field_4[r6].appeal2, r6); - gTasks[taskId].data[0] = 13; - return; - case 13: - if (!gContestResources->field_14[gContestResources->field_0->unk19215].unk2_2) - gTasks[taskId].data[0] = 35; - return; - case 35: - if (gContestResources->field_4[r6].conditionMod == 1) - sub_80DD720(8); - gTasks[taskId].data[0] = 36; - return; - case 36: - if (!gContestResources->field_0->unk1920A_4) - gTasks[taskId].data[0] = 37; - return; - case 37: - if (sub_80DB5B8(r6, 1)) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 38; - } - else - { - gTasks[taskId].data[0] = 50; - } - return; - case 38: - if (++gTasks[taskId].data[10] > 20) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 50; - } - return; - case 50: - if (sub_80DB798(r6)) - PlaySE(SE_C_PASI); - gTasks[taskId].data[0] = 25; - return; - case 25: - gTasks[taskId].data[1] = 0; - gTasks[taskId].data[0] = 26; - return; - case 26: + } + gTasks[taskId].data[0] = 49; + return; + case 49: + if (!gContestResources->field_0->unk1920A_4) + gTasks[taskId].data[0] = 47; + return; + case 47: + sub_80DE008(TRUE); + gTasks[taskId].data[0] = 12; + return; + case 12: + sub_80DC028(0, gContestResources->field_4[r6].appeal2, r6); + gTasks[taskId].data[0] = 13; + return; + case 13: + if (!gContestResources->field_14[gContestResources->field_0->unk19215].unk2_2) + gTasks[taskId].data[0] = 35; + return; + case 35: + if (gContestResources->field_4[r6].conditionMod == 1) + sub_80DD720(8); + gTasks[taskId].data[0] = 36; + return; + case 36: + if (!gContestResources->field_0->unk1920A_4) + gTasks[taskId].data[0] = 37; + return; + case 37: + if (sub_80DB5B8(r6, 1)) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 38; + } + else + { + gTasks[taskId].data[0] = 50; + } + return; + case 38: + if (++gTasks[taskId].data[10] > 20) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 50; + } + return; + case 50: + if (sub_80DB798(r6)) + PlaySE(SE_C_PASI); + gTasks[taskId].data[0] = 25; + return; + case 25: + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[0] = 26; + return; + case 26: { s32 r2 = 0; @@ -1276,425 +1276,425 @@ static void sub_80D8B38(u8 taskId) sub_80DB884(); } } - return; - case 27: - if (!Contest_RunTextPrinters()) - gTasks[taskId].data[0] = 28; - return; - case 28: - for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++) - ; - sub_80DC028(gContestResources->field_4[i].appeal2 + gContestResources->field_4[i].jam, -gContestResources->field_4[i].jam, i); - gTasks[taskId].data[0] = 29; - return; - case 29: - for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++) - ; - if (!gContestResources->field_14[i].unk2_2) - gTasks[taskId].data[0] = 39; - return; - case 39: - for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++) - ; - if (sub_80DB5B8(i, 1)) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 40; - } - else - { - gTasks[taskId].data[0] = 30; - } - return; - case 40: - if (++gTasks[taskId].data[10] > 20) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 30; - } - return; - case 30: - for (i = 0; i < 4; i++) - { - if (gUnknown_02039F26[i] == gTasks[taskId].data[1]) - break; - } - if (sub_80DB798(i)) - PlaySE(SE_C_PASI); - else - PlaySE(SE_C_SYU); - if (gContestResources->field_4[i].judgesAttentionWasRemoved) - { - sub_80DC674(i); - gContestResources->field_4[i].judgesAttentionWasRemoved = 0; - } - gTasks[taskId].data[1]++; - gTasks[taskId].data[0] = 26; - return; - case 51: - if (gTasks[taskId].data[10]++ > 9) - { - gTasks[taskId].data[10] = 0; - if (gContestResources->field_4[r6].numTurnsSkipped != 0 - || gContestResources->field_4[r6].turnSkipped) - { - sub_80DB89C(); - StringCopy(gStringVar1, gContestMons[r6].nickname); - StringExpandPlaceholders(gStringVar4, gText_0827E793); - Contest_StartTextPrinter(gStringVar4, 1); - } - gTasks[taskId].data[0] = 52; - } - return; - case 52: - if (!Contest_RunTextPrinters()) - { - if (!gContestResources->field_4[r6].unk15_6) - gTasks[taskId].data[0] = 17; - else - gTasks[taskId].data[0] = 14; - } - return; - case 14: - r3 = gContestResources->field_4[r6].unk16; - if (gContestResources->field_4[r6].unk16 != 0) - { - sub_80DB89C(); - if (r3 == 1) - Contest_StartTextPrinter(gText_0827E32E, 1); - else if (r3 == 2) - Contest_StartTextPrinter(gText_0827E35B, 1); - else - Contest_StartTextPrinter(gText_0827E38D, 1); - sub_80DD720(3); - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 45; - } - else - { - sub_80DB89C(); - StringCopy(gStringVar1, gContestMons[r6].nickname); - StringExpandPlaceholders(gStringVar4, gText_0827E2FE); - Contest_StartTextPrinter(gStringVar4, 1); - sub_80DD720(2); - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 45; - } - return; - case 45: - if (!gContestResources->field_0->unk1920A_4) - { - sub_80DC9B4(gContestResources->field_0->unk19215); - gTasks[taskId].data[0] = 15; - } - return; - case 15: - if (!Contest_RunTextPrinters()) - { - if (++gTasks[taskId].data[10] > 50) - { - if (!gContestResources->field_4[r6].hasJudgesAttention) - { - sub_80DC028( - gContestResources->field_4[r6].appeal2, - gContestResources->field_4[r6].unk17, - r6); - gContestResources->field_4[r6].appeal2 += gContestResources->field_4[r6].unk17; - } - gTasks[taskId].data[0] = 16; - } - } - return; - case 16: - if (!gContestResources->field_14[r6].unk2_2) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 17; - } - return; - case 17: - if (gContestResources->field_4[r6].disappointedRepeat) - { - sub_80DB89C(); - StringCopy(gStringVar1, gContestMons[r6].nickname); - StringExpandPlaceholders(gStringVar4, gText_0827E6E3); - Contest_StartTextPrinter(gStringVar4, 1); - gTasks[taskId].data[10] = 0; - sub_80DD720(0); - gTasks[taskId].data[0] = 46; - } - else - { - gTasks[taskId].data[0] = 41; - } - return; - case 46: - if (!gContestResources->field_0->unk1920A_4) - gTasks[taskId].data[0] = 19; - return; - case 19: - if (!Contest_RunTextPrinters()) - { - sub_80DC028(gContestResources->field_4[r6].appeal2, -gContestResources->field_4[r6].unk18, r6); - gContestResources->field_4[r6].appeal2 -= gContestResources->field_4[r6].unk18; - gTasks[taskId].data[0] = 18; - } - return; - case 18: - sub_80DCD48(); - if (!gContestResources->field_14[r6].unk2_2) - { - gTasks[taskId].data[10] = 0; - sub_80DB89C(); - gTasks[taskId].data[0] = 41; - } - return; - case 41: - if (gContestResources->field_10->excitementFrozen && r6 != gContestResources->field_10->excitementFreezer) - { - gTasks[taskId].data[0] = 57; - } - else - { - r3 = gContestResources->field_10->bits_0; - if (gContestResources->field_4[r6].overrideCategoryExcitementMod) - { - r3 = 1; - StringCopy(gStringVar3, gMoveNames[gContestResources->field_4[r6].currMove]); - } - else - { - StringCopy(gStringVar3, gUnknown_08587F08[gContestMoves[gContestResources->field_4[r6].currMove].contestCategory]); - } - if (r3 > 0) - { - if (gContestResources->field_4[r6].disappointedRepeat) - r3 = 0; - } - sub_80DB89C(); - StringCopy(gStringVar1, gContestMons[r6].nickname); - gContestResources->field_0->applauseLevel += r3; - if (gContestResources->field_0->applauseLevel < 0) - gContestResources->field_0->applauseLevel = 0; - if (r3 == 0) - { - gTasks[taskId].data[0] = 55; - } - else - { - if (r3 < 0) - StringExpandPlaceholders(gStringVar4, gText_0827E73C); - else if (r3 > 0 && gContestResources->field_0->applauseLevel <= 4) - StringExpandPlaceholders(gStringVar4, gText_0827E717); - else - StringExpandPlaceholders(gStringVar4, gText_0827E76A); - Contest_StartTextPrinter(gStringVar4, 1); - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[11] = 0; - if (r3 < 0) - gTasks[taskId].data[0] = 53; - else - gTasks[taskId].data[0] = 54; - } - } - return; - case 53: - switch (gTasks[taskId].data[10]) - { - case 0: - sub_80DDED0(-1, 1); - PlayFanfare(MUS_ME_ZANNEN); - gTasks[taskId].data[10]++; - break; - case 1: - if (!gContestResources->field_0->unk1920B_0 && !Contest_RunTextPrinters()) - { - sub_80DDCDC(-1); - gTasks[taskId].data[10]++; - } - break; - case 2: - if (!gContestResources->field_0->unk1920A_5) - { - if (gTasks[taskId].data[11]++ > 29) - { - gTasks[taskId].data[11] = 0; - sub_80DDED0(-1, -1); - gTasks[taskId].data[10]++; - } - } - break; - case 3: - if (!gPaletteFade.active) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[11] = 0; - gTasks[taskId].data[0] = 43; - } - break; - } - return; - case 54: - switch (gTasks[taskId].data[10]) - { - case 0: - if (!Contest_RunTextPrinters()) - { - sub_80DDED0(1, 1); - gTasks[taskId].data[10]++; - } - break; - case 1: - if (!gContestResources->field_0->unk1920B_0) - { - sub_80DDE0C(); - PlaySE(SE_W227B); - sub_80DDCDC(1); - gTasks[taskId].data[10]++; - } - break; - case 2: - if (!gContestResources->field_0->unk1920A_5) - { - if (gTasks[taskId].data[11]++ > 29) - { - gTasks[taskId].data[11] = 0; - sub_80DC028(gContestResources->field_4[r6].appeal2, gContestResources->field_10->unk2, r6); - gContestResources->field_4[r6].appeal2 += gContestResources->field_10->unk2; - gTasks[taskId].data[10]++; - } - } - break; - case 3: - if (!gContestResources->field_14[r6].unk2_2) - { - if (!gContestResources->field_0->unk1920A_7) - { - sub_80DDED0(1, -1); - gTasks[taskId].data[10]++; - } - } - break; - case 4: - if (!gPaletteFade.active) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[11] = 0; - gTasks[taskId].data[0] = 43; - } - break; - } - return; - case 43: - if (!gContestResources->field_14[r6].unk2_2) - { - sub_80DB89C(); - gTasks[taskId].data[0] = 55; - } - return; - case 57: - sub_80DB89C(); - StringCopy(gStringVar3, gContestMons[gContestResources->field_10->excitementFreezer].nickname); - StringCopy(gStringVar1, gContestMons[r6].nickname); - StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]); - StringExpandPlaceholders(gStringVar4, gText_0827E7EA); - Contest_StartTextPrinter(gStringVar4, 1); - gTasks[taskId].data[0] = 58; - return; - case 58: - if (!Contest_RunTextPrinters()) - { - sub_80DB89C(); - StringExpandPlaceholders(gStringVar4, gText_0827E817); - Contest_StartTextPrinter(gStringVar4, 1); - gTasks[taskId].data[0] = 59; - } - return; - case 59: - if (!Contest_RunTextPrinters()) - { - sub_80DB89C(); - gTasks[taskId].data[0] = 55; - } - return; - case 33: - if (gContestResources->field_4[r6].hasJudgesAttention) - gContestResources->field_4[r6].hasJudgesAttention = 0; - sub_80DC9B4(r6); - StringCopy(gStringVar1, gContestMons[r6].nickname); - StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]); - StringExpandPlaceholders(gStringVar4, gText_0827E58A); - Contest_StartTextPrinter(gStringVar4, 1); - gTasks[taskId].data[0] = 34; - return; - case 34: - if (!Contest_RunTextPrinters()) - gTasks[taskId].data[0] = 55; - return; - case 55: - sub_80DDBE8(); - gTasks[taskId].data[0] = 56; - return; - case 56: - if (!gContestResources->field_0->unk1920A_6) - { - if (gContestResources->field_0->applauseLevel > 4) - { - gContestResources->field_0->applauseLevel = 0; - sub_80DD940(); - } - gTasks[taskId].data[0] = 10; - } - return; - case 10: - spriteId = gTasks[taskId].data[2]; - gSprites[spriteId].callback = sub_80DA164; - gTasks[taskId].data[0] = 11; - return; - case 11: - spriteId = gTasks[taskId].data[2]; - if (gSprites[spriteId].invisible) - { - FreeSpriteOamMatrix(&gSprites[spriteId]); - DestroySprite(&gSprites[spriteId]); - gTasks[taskId].data[0] = 20; - } - return; - case 20: + return; + case 27: + if (!Contest_RunTextPrinters()) + gTasks[taskId].data[0] = 28; + return; + case 28: + for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++) + ; + sub_80DC028(gContestResources->field_4[i].appeal2 + gContestResources->field_4[i].jam, -gContestResources->field_4[i].jam, i); + gTasks[taskId].data[0] = 29; + return; + case 29: + for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++) + ; + if (!gContestResources->field_14[i].unk2_2) + gTasks[taskId].data[0] = 39; + return; + case 39: + for (i = 0; gTasks[taskId].data[1] != gUnknown_02039F26[i]; i++) + ; + if (sub_80DB5B8(i, 1)) + { gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 21; - return; - case 31: + gTasks[taskId].data[0] = 40; + } + else + { + gTasks[taskId].data[0] = 30; + } + return; + case 40: + if (++gTasks[taskId].data[10] > 20) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 30; + } + return; + case 30: + for (i = 0; i < 4; i++) + { + if (gUnknown_02039F26[i] == gTasks[taskId].data[1]) + break; + } + if (sub_80DB798(i)) + PlaySE(SE_C_PASI); + else + PlaySE(SE_C_SYU); + if (gContestResources->field_4[i].judgesAttentionWasRemoved) + { + sub_80DC674(i); + gContestResources->field_4[i].judgesAttentionWasRemoved = 0; + } + gTasks[taskId].data[1]++; + gTasks[taskId].data[0] = 26; + return; + case 51: + if (gTasks[taskId].data[10]++ > 9) + { + gTasks[taskId].data[10] = 0; + if (gContestResources->field_4[r6].numTurnsSkipped != 0 + || gContestResources->field_4[r6].turnSkipped) + { + sub_80DB89C(); + StringCopy(gStringVar1, gContestMons[r6].nickname); + StringExpandPlaceholders(gStringVar4, gText_0827E793); + Contest_StartTextPrinter(gStringVar4, 1); + } + gTasks[taskId].data[0] = 52; + } + return; + case 52: + if (!Contest_RunTextPrinters()) + { + if (!gContestResources->field_4[r6].unk15_6) + gTasks[taskId].data[0] = 17; + else + gTasks[taskId].data[0] = 14; + } + return; + case 14: + r3 = gContestResources->field_4[r6].unk16; + if (gContestResources->field_4[r6].unk16 != 0) + { + sub_80DB89C(); + if (r3 == 1) + Contest_StartTextPrinter(gText_0827E32E, 1); + else if (r3 == 2) + Contest_StartTextPrinter(gText_0827E35B, 1); + else + Contest_StartTextPrinter(gText_0827E38D, 1); + sub_80DD720(3); + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 45; + } + else + { sub_80DB89C(); StringCopy(gStringVar1, gContestMons[r6].nickname); - StringExpandPlaceholders(gStringVar4, gText_0827D56F); + StringExpandPlaceholders(gStringVar4, gText_0827E2FE); Contest_StartTextPrinter(gStringVar4, 1); - gTasks[taskId].data[0] = 32; - return; - case 32: - if (!Contest_RunTextPrinters()) - gTasks[taskId].data[0] = 21; - return; - case 21: - if (++gTasks[taskId].data[10] > 29) + sub_80DD720(2); + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 45; + } + return; + case 45: + if (!gContestResources->field_0->unk1920A_4) + { + sub_80DC9B4(gContestResources->field_0->unk19215); + gTasks[taskId].data[0] = 15; + } + return; + case 15: + if (!Contest_RunTextPrinters()) + { + if (++gTasks[taskId].data[10] > 50) { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[0] = 22; + if (!gContestResources->field_4[r6].hasJudgesAttention) + { + sub_80DC028( + gContestResources->field_4[r6].appeal2, + gContestResources->field_4[r6].unk17, + r6); + gContestResources->field_4[r6].appeal2 += gContestResources->field_4[r6].unk17; + } + gTasks[taskId].data[0] = 16; } - return; - case 22: - if (++gContestResources->field_0->unk19214 == 4) + } + return; + case 16: + if (!gContestResources->field_14[r6].unk2_2) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 17; + } + return; + case 17: + if (gContestResources->field_4[r6].disappointedRepeat) + { + sub_80DB89C(); + StringCopy(gStringVar1, gContestMons[r6].nickname); + StringExpandPlaceholders(gStringVar4, gText_0827E6E3); + Contest_StartTextPrinter(gStringVar4, 1); + gTasks[taskId].data[10] = 0; + sub_80DD720(0); + gTasks[taskId].data[0] = 46; + } + else + { + gTasks[taskId].data[0] = 41; + } + return; + case 46: + if (!gContestResources->field_0->unk1920A_4) + gTasks[taskId].data[0] = 19; + return; + case 19: + if (!Contest_RunTextPrinters()) + { + sub_80DC028(gContestResources->field_4[r6].appeal2, -gContestResources->field_4[r6].unk18, r6); + gContestResources->field_4[r6].appeal2 -= gContestResources->field_4[r6].unk18; + gTasks[taskId].data[0] = 18; + } + return; + case 18: + sub_80DCD48(); + if (!gContestResources->field_14[r6].unk2_2) + { + gTasks[taskId].data[10] = 0; + sub_80DB89C(); + gTasks[taskId].data[0] = 41; + } + return; + case 41: + if (gContestResources->field_10->excitementFrozen && r6 != gContestResources->field_10->excitementFreezer) + { + gTasks[taskId].data[0] = 57; + } + else + { + r3 = gContestResources->field_10->bits_0; + if (gContestResources->field_4[r6].overrideCategoryExcitementMod) { - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[1] = 0; - gTasks[taskId].data[2] = 0; - gTasks[taskId].func = sub_80DA198; + r3 = 1; + StringCopy(gStringVar3, gMoveNames[gContestResources->field_4[r6].currMove]); } else { - gTasks[taskId].data[0] = 0; + StringCopy(gStringVar3, gUnknown_08587F08[gContestMoves[gContestResources->field_4[r6].currMove].contestCategory]); } - return; + if (r3 > 0) + { + if (gContestResources->field_4[r6].disappointedRepeat) + r3 = 0; + } + sub_80DB89C(); + StringCopy(gStringVar1, gContestMons[r6].nickname); + gContestResources->field_0->applauseLevel += r3; + if (gContestResources->field_0->applauseLevel < 0) + gContestResources->field_0->applauseLevel = 0; + if (r3 == 0) + { + gTasks[taskId].data[0] = 55; + } + else + { + if (r3 < 0) + StringExpandPlaceholders(gStringVar4, gText_0827E73C); + else if (r3 > 0 && gContestResources->field_0->applauseLevel <= 4) + StringExpandPlaceholders(gStringVar4, gText_0827E717); + else + StringExpandPlaceholders(gStringVar4, gText_0827E76A); + Contest_StartTextPrinter(gStringVar4, 1); + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[11] = 0; + if (r3 < 0) + gTasks[taskId].data[0] = 53; + else + gTasks[taskId].data[0] = 54; + } + } + return; + case 53: + switch (gTasks[taskId].data[10]) + { + case 0: + sub_80DDED0(-1, 1); + PlayFanfare(MUS_ME_ZANNEN); + gTasks[taskId].data[10]++; + break; + case 1: + if (!gContestResources->field_0->unk1920B_0 && !Contest_RunTextPrinters()) + { + sub_80DDCDC(-1); + gTasks[taskId].data[10]++; + } + break; + case 2: + if (!gContestResources->field_0->unk1920A_5) + { + if (gTasks[taskId].data[11]++ > 29) + { + gTasks[taskId].data[11] = 0; + sub_80DDED0(-1, -1); + gTasks[taskId].data[10]++; + } + } + break; + case 3: + if (!gPaletteFade.active) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[11] = 0; + gTasks[taskId].data[0] = 43; + } + break; + } + return; + case 54: + switch (gTasks[taskId].data[10]) + { + case 0: + if (!Contest_RunTextPrinters()) + { + sub_80DDED0(1, 1); + gTasks[taskId].data[10]++; + } + break; + case 1: + if (!gContestResources->field_0->unk1920B_0) + { + sub_80DDE0C(); + PlaySE(SE_W227B); + sub_80DDCDC(1); + gTasks[taskId].data[10]++; + } + break; + case 2: + if (!gContestResources->field_0->unk1920A_5) + { + if (gTasks[taskId].data[11]++ > 29) + { + gTasks[taskId].data[11] = 0; + sub_80DC028(gContestResources->field_4[r6].appeal2, gContestResources->field_10->unk2, r6); + gContestResources->field_4[r6].appeal2 += gContestResources->field_10->unk2; + gTasks[taskId].data[10]++; + } + } + break; + case 3: + if (!gContestResources->field_14[r6].unk2_2) + { + if (!gContestResources->field_0->unk1920A_7) + { + sub_80DDED0(1, -1); + gTasks[taskId].data[10]++; + } + } + break; + case 4: + if (!gPaletteFade.active) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[11] = 0; + gTasks[taskId].data[0] = 43; + } + break; + } + return; + case 43: + if (!gContestResources->field_14[r6].unk2_2) + { + sub_80DB89C(); + gTasks[taskId].data[0] = 55; + } + return; + case 57: + sub_80DB89C(); + StringCopy(gStringVar3, gContestMons[gContestResources->field_10->excitementFreezer].nickname); + StringCopy(gStringVar1, gContestMons[r6].nickname); + StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]); + StringExpandPlaceholders(gStringVar4, gText_0827E7EA); + Contest_StartTextPrinter(gStringVar4, 1); + gTasks[taskId].data[0] = 58; + return; + case 58: + if (!Contest_RunTextPrinters()) + { + sub_80DB89C(); + StringExpandPlaceholders(gStringVar4, gText_0827E817); + Contest_StartTextPrinter(gStringVar4, 1); + gTasks[taskId].data[0] = 59; + } + return; + case 59: + if (!Contest_RunTextPrinters()) + { + sub_80DB89C(); + gTasks[taskId].data[0] = 55; + } + return; + case 33: + if (gContestResources->field_4[r6].hasJudgesAttention) + gContestResources->field_4[r6].hasJudgesAttention = 0; + sub_80DC9B4(r6); + StringCopy(gStringVar1, gContestMons[r6].nickname); + StringCopy(gStringVar2, gMoveNames[gContestResources->field_4[r6].currMove]); + StringExpandPlaceholders(gStringVar4, gText_0827E58A); + Contest_StartTextPrinter(gStringVar4, 1); + gTasks[taskId].data[0] = 34; + return; + case 34: + if (!Contest_RunTextPrinters()) + gTasks[taskId].data[0] = 55; + return; + case 55: + sub_80DDBE8(); + gTasks[taskId].data[0] = 56; + return; + case 56: + if (!gContestResources->field_0->unk1920A_6) + { + if (gContestResources->field_0->applauseLevel > 4) + { + gContestResources->field_0->applauseLevel = 0; + sub_80DD940(); + } + gTasks[taskId].data[0] = 10; + } + return; + case 10: + spriteId = gTasks[taskId].data[2]; + gSprites[spriteId].callback = sub_80DA164; + gTasks[taskId].data[0] = 11; + return; + case 11: + spriteId = gTasks[taskId].data[2]; + if (gSprites[spriteId].invisible) + { + FreeSpriteOamMatrix(&gSprites[spriteId]); + DestroySprite(&gSprites[spriteId]); + gTasks[taskId].data[0] = 20; + } + return; + case 20: + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 21; + return; + case 31: + sub_80DB89C(); + StringCopy(gStringVar1, gContestMons[r6].nickname); + StringExpandPlaceholders(gStringVar4, gText_0827D56F); + Contest_StartTextPrinter(gStringVar4, 1); + gTasks[taskId].data[0] = 32; + return; + case 32: + if (!Contest_RunTextPrinters()) + gTasks[taskId].data[0] = 21; + return; + case 21: + if (++gTasks[taskId].data[10] > 29) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 22; + } + return; + case 22: + if (++gContestResources->field_0->unk19214 == 4) + { + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[2] = 0; + gTasks[taskId].func = sub_80DA198; + } + else + { + gTasks[taskId].data[0] = 0; + } + return; } } @@ -2309,32 +2309,32 @@ static u16 sub_80DAFE0(u8 who, u8 contestCategory) switch (contestCategory) { - case CONTEST_CATEGORY_COOL: - statMain = gContestMons[who].cool; - statSub1 = gContestMons[who].tough; - statSub2 = gContestMons[who].beauty; - break; - case CONTEST_CATEGORY_BEAUTY: - statMain = gContestMons[who].beauty; - statSub1 = gContestMons[who].cool; - statSub2 = gContestMons[who].cute; - break; - case CONTEST_CATEGORY_CUTE: - statMain = gContestMons[who].cute; - statSub1 = gContestMons[who].beauty; - statSub2 = gContestMons[who].smart; - break; - case CONTEST_CATEGORY_SMART: - statMain = gContestMons[who].smart; - statSub1 = gContestMons[who].cute; - statSub2 = gContestMons[who].tough; - break; - case CONTEST_CATEGORY_TOUGH: - default: - statMain = gContestMons[who].tough; - statSub1 = gContestMons[who].smart; - statSub2 = gContestMons[who].cool; - break; + case CONTEST_CATEGORY_COOL: + statMain = gContestMons[who].cool; + statSub1 = gContestMons[who].tough; + statSub2 = gContestMons[who].beauty; + break; + case CONTEST_CATEGORY_BEAUTY: + statMain = gContestMons[who].beauty; + statSub1 = gContestMons[who].cool; + statSub2 = gContestMons[who].cute; + break; + case CONTEST_CATEGORY_CUTE: + statMain = gContestMons[who].cute; + statSub1 = gContestMons[who].beauty; + statSub2 = gContestMons[who].smart; + break; + case CONTEST_CATEGORY_SMART: + statMain = gContestMons[who].smart; + statSub1 = gContestMons[who].cute; + statSub2 = gContestMons[who].tough; + break; + case CONTEST_CATEGORY_TOUGH: + default: + statMain = gContestMons[who].tough; + statSub1 = gContestMons[who].smart; + statSub2 = gContestMons[who].cool; + break; } return statMain + (statSub1 + statSub2 + gContestMons[who].sheen) / 2; } @@ -2420,18 +2420,18 @@ static u16 sub_80DB2EC(u16 a0, u8 a1) switch (gContestEffects[gContestMoves[a0].effect].effectType) { - case 0: - case 1: - case 8: - var = 0x9082; - break; - case 2: - case 3: - var = 0x9088; - break; - default: - var = 0x9086; - break; + case 0: + case 1: + case 8: + var = 0x9082; + break; + case 2: + case 3: + var = 0x9088; + break; + default: + var = 0x9086; + break; } var += 0x9000 + (a1 << 12); return var; @@ -2563,21 +2563,21 @@ static u16 sub_80DB748(u8 status) switch (status) { - case 0: - var = 0x80; - break; - case 1: - var = 0x84; - break; - case 2: - var = 0x86; - break; - case 3: - var = 0x88; - break; - case 4: - var = 0x82; - break; + case 0: + var = 0x80; + break; + case 1: + var = 0x84; + break; + case 2: + var = 0x86; + break; + case 3: + var = 0x88; + break; + case 4: + var = 0x82; + break; } var += 0x9000; return var; From 73d919fa0f798c14ca8e4097bb1d4fe06500ac18 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 28 Jan 2019 19:02:34 +0100 Subject: [PATCH 12/42] Define double single left right qutoation marks char --- include/text.h | 8 ++++---- src/contest.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/text.h b/include/text.h index aa499f558f..96c5a45071 100644 --- a/include/text.h +++ b/include/text.h @@ -18,10 +18,10 @@ #define CHAR_PERIOD 0xAD #define CHAR_HYPHEN 0xAE #define CHAR_ELLIPSIS 0xB0 -#define CHAR_DOUBLE_QUOTATION_LEFT 0xB1 -#define CHAR_DOUBLE_QUOTATION_RIGHT 0xB2 -#define CHAR_SINGLE_QUOTATION_LEFT 0xB3 -#define CHAR_SINGLE_QUOTATION_RIGHT 0xB4 +#define CHAR_DBL_QUOT_LEFT 0xB1 +#define CHAR_DBL_QUOT_RIGHT 0xB2 +#define CHAR_SGL_QUOT_LEFT 0xB3 +#define CHAR_SGL_QUOT_RIGHT 0xB4 #define CHAR_MALE 0xB5 #define CHAR_FEMALE 0xB6 #define CHAR_CURRENCY 0xB7 diff --git a/src/contest.c b/src/contest.c index 5b7363ec05..b24036f39b 100644 --- a/src/contest.c +++ b/src/contest.c @@ -5106,10 +5106,10 @@ static u8 sub_80DF940(u8 *nickname) || *nickname == CHAR_SLASH || *nickname == CHAR_HYPHEN || *nickname == CHAR_ELLIPSIS - || *nickname == CHAR_DOUBLE_QUOTATION_LEFT - || *nickname == CHAR_DOUBLE_QUOTATION_RIGHT - || *nickname == CHAR_SINGLE_QUOTATION_LEFT - || *nickname == CHAR_DOUBLE_QUOTATION_LEFT) // Most likely a typo, CHAR_SINGLE_QUOTATION_RIGHT should be here instead. + || *nickname == CHAR_DBL_QUOT_LEFT + || *nickname == CHAR_DBL_QUOT_RIGHT + || *nickname == CHAR_SGL_QUOT_LEFT + || *nickname == CHAR_DBL_QUOT_LEFT) // Most likely a typo, CHAR_SGL_QUOT_RIGHT should be here instead. { nickname++; } From e81838dba397903afbd5bdacf3a54061446e7721 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 19 Jan 2019 15:32:25 -0600 Subject: [PATCH 13/42] Misc. documentation and move some data into .c files --- data/fanfares.s | 26 --- data/field_weather.s | 103 ------------ graphics/misc/sunny_day/0.pal | 259 ------------------------------ graphics/misc/sunny_day/1.pal | 259 ------------------------------ graphics/misc/sunny_day/10.pal | 259 ------------------------------ graphics/misc/sunny_day/11.pal | 259 ------------------------------ graphics/misc/sunny_day/12.pal | 259 ------------------------------ graphics/misc/sunny_day/13.pal | 259 ------------------------------ graphics/misc/sunny_day/14.pal | 259 ------------------------------ graphics/misc/sunny_day/15.pal | 259 ------------------------------ graphics/misc/sunny_day/16.pal | 259 ------------------------------ graphics/misc/sunny_day/17.pal | 259 ------------------------------ graphics/misc/sunny_day/18.pal | 259 ------------------------------ graphics/misc/sunny_day/19.pal | 259 ------------------------------ graphics/misc/sunny_day/2.pal | 259 ------------------------------ graphics/misc/sunny_day/20.pal | 259 ------------------------------ graphics/misc/sunny_day/21.pal | 259 ------------------------------ graphics/misc/sunny_day/22.pal | 259 ------------------------------ graphics/misc/sunny_day/23.pal | 259 ------------------------------ graphics/misc/sunny_day/24.pal | 259 ------------------------------ graphics/misc/sunny_day/25.pal | 259 ------------------------------ graphics/misc/sunny_day/26.pal | 259 ------------------------------ graphics/misc/sunny_day/27.pal | 259 ------------------------------ graphics/misc/sunny_day/28.pal | 259 ------------------------------ graphics/misc/sunny_day/29.pal | 259 ------------------------------ graphics/misc/sunny_day/3.pal | 259 ------------------------------ graphics/misc/sunny_day/30.pal | 259 ------------------------------ graphics/misc/sunny_day/31.pal | 259 ------------------------------ graphics/misc/sunny_day/32.pal | 259 ------------------------------ graphics/misc/sunny_day/33.pal | 259 ------------------------------ graphics/misc/sunny_day/34.pal | 259 ------------------------------ graphics/misc/sunny_day/35.pal | 259 ------------------------------ graphics/misc/sunny_day/36.pal | 259 ------------------------------ graphics/misc/sunny_day/37.pal | 259 ------------------------------ graphics/misc/sunny_day/38.pal | 259 ------------------------------ graphics/misc/sunny_day/39.pal | 259 ------------------------------ graphics/misc/sunny_day/4.pal | 259 ------------------------------ graphics/misc/sunny_day/40.pal | 259 ------------------------------ graphics/misc/sunny_day/41.pal | 259 ------------------------------ graphics/misc/sunny_day/42.pal | 259 ------------------------------ graphics/misc/sunny_day/43.pal | 259 ------------------------------ graphics/misc/sunny_day/44.pal | 259 ------------------------------ graphics/misc/sunny_day/45.pal | 259 ------------------------------ graphics/misc/sunny_day/46.pal | 259 ------------------------------ graphics/misc/sunny_day/47.pal | 259 ------------------------------ graphics/misc/sunny_day/48.pal | 259 ------------------------------ graphics/misc/sunny_day/49.pal | 259 ------------------------------ graphics/misc/sunny_day/5.pal | 259 ------------------------------ graphics/misc/sunny_day/50.pal | 259 ------------------------------ graphics/misc/sunny_day/51.pal | 259 ------------------------------ graphics/misc/sunny_day/52.pal | 259 ------------------------------ graphics/misc/sunny_day/53.pal | 259 ------------------------------ graphics/misc/sunny_day/54.pal | 259 ------------------------------ graphics/misc/sunny_day/55.pal | 259 ------------------------------ graphics/misc/sunny_day/56.pal | 259 ------------------------------ graphics/misc/sunny_day/57.pal | 259 ------------------------------ graphics/misc/sunny_day/58.pal | 259 ------------------------------ graphics/misc/sunny_day/59.pal | 259 ------------------------------ graphics/misc/sunny_day/6.pal | 259 ------------------------------ graphics/misc/sunny_day/60.pal | 259 ------------------------------ graphics/misc/sunny_day/61.pal | 259 ------------------------------ graphics/misc/sunny_day/62.pal | 259 ------------------------------ graphics/misc/sunny_day/63.pal | 259 ------------------------------ graphics/misc/sunny_day/64.pal | 259 ------------------------------ graphics/misc/sunny_day/65.pal | 259 ------------------------------ graphics/misc/sunny_day/66.pal | 259 ------------------------------ graphics/misc/sunny_day/67.pal | 259 ------------------------------ graphics/misc/sunny_day/68.pal | 259 ------------------------------ graphics/misc/sunny_day/69.pal | 259 ------------------------------ graphics/misc/sunny_day/7.pal | 259 ------------------------------ graphics/misc/sunny_day/70.pal | 259 ------------------------------ graphics/misc/sunny_day/71.pal | 259 ------------------------------ graphics/misc/sunny_day/72.pal | 259 ------------------------------ graphics/misc/sunny_day/73.pal | 259 ------------------------------ graphics/misc/sunny_day/74.pal | 259 ------------------------------ graphics/misc/sunny_day/75.pal | 259 ------------------------------ graphics/misc/sunny_day/76.pal | 259 ------------------------------ graphics/misc/sunny_day/77.pal | 259 ------------------------------ graphics/misc/sunny_day/78.pal | 259 ------------------------------ graphics/misc/sunny_day/79.pal | 259 ------------------------------ graphics/misc/sunny_day/8.pal | 259 ------------------------------ graphics/misc/sunny_day/80.pal | 259 ------------------------------ graphics/misc/sunny_day/81.pal | 259 ------------------------------ graphics/misc/sunny_day/82.pal | 259 ------------------------------ graphics/misc/sunny_day/83.pal | 259 ------------------------------ graphics/misc/sunny_day/84.pal | 259 ------------------------------ graphics/misc/sunny_day/85.pal | 259 ------------------------------ graphics/misc/sunny_day/86.pal | 259 ------------------------------ graphics/misc/sunny_day/87.pal | 259 ------------------------------ graphics/misc/sunny_day/88.pal | 259 ------------------------------ graphics/misc/sunny_day/89.pal | 259 ------------------------------ graphics/misc/sunny_day/9.pal | 259 ------------------------------ graphics/misc/sunny_day/90.pal | 259 ------------------------------ graphics/misc/sunny_day/91.pal | 259 ------------------------------ graphics/misc/sunny_day/92.pal | 259 ------------------------------ graphics/misc/sunny_day/93.pal | 259 ------------------------------ graphics/misc/sunny_day/94.pal | 259 ------------------------------ graphics/misc/sunny_day/95.pal | 259 ------------------------------ graphics/weather/drought/0.gbapal | Bin 0 -> 8192 bytes graphics/weather/drought/1.gbapal | Bin 0 -> 8192 bytes graphics/weather/drought/2.gbapal | Bin 0 -> 8192 bytes graphics/weather/drought/3.gbapal | Bin 0 -> 8192 bytes graphics/weather/drought/4.gbapal | Bin 0 -> 8192 bytes graphics/weather/drought/5.gbapal | Bin 0 -> 8192 bytes include/battle.h | 70 ++++---- include/battle_util.h | 6 +- include/global.tv.h | 4 +- ld_script.txt | 3 +- src/battle_bg.c | 26 +-- src/battle_controller_player.c | 6 +- src/battle_gfx_sfx_util.c | 4 +- src/battle_intro.c | 8 +- src/battle_main.c | 4 +- src/battle_script_commands.c | 28 ++-- src/battle_util.c | 50 +++--- src/field_weather.c | 20 ++- src/pokemon.c | 16 +- src/recorded_battle.c | 6 +- src/sound.c | 22 ++- src/tv.c | 16 +- 120 files changed, 158 insertions(+), 25124 deletions(-) delete mode 100644 data/fanfares.s delete mode 100644 data/field_weather.s delete mode 100644 graphics/misc/sunny_day/0.pal delete mode 100644 graphics/misc/sunny_day/1.pal delete mode 100644 graphics/misc/sunny_day/10.pal delete mode 100644 graphics/misc/sunny_day/11.pal delete mode 100644 graphics/misc/sunny_day/12.pal delete mode 100644 graphics/misc/sunny_day/13.pal delete mode 100644 graphics/misc/sunny_day/14.pal delete mode 100644 graphics/misc/sunny_day/15.pal delete mode 100644 graphics/misc/sunny_day/16.pal delete mode 100644 graphics/misc/sunny_day/17.pal delete mode 100644 graphics/misc/sunny_day/18.pal delete mode 100644 graphics/misc/sunny_day/19.pal delete mode 100644 graphics/misc/sunny_day/2.pal delete mode 100644 graphics/misc/sunny_day/20.pal delete mode 100644 graphics/misc/sunny_day/21.pal delete mode 100644 graphics/misc/sunny_day/22.pal delete mode 100644 graphics/misc/sunny_day/23.pal delete mode 100644 graphics/misc/sunny_day/24.pal delete mode 100644 graphics/misc/sunny_day/25.pal delete mode 100644 graphics/misc/sunny_day/26.pal delete mode 100644 graphics/misc/sunny_day/27.pal delete mode 100644 graphics/misc/sunny_day/28.pal delete mode 100644 graphics/misc/sunny_day/29.pal delete mode 100644 graphics/misc/sunny_day/3.pal delete mode 100644 graphics/misc/sunny_day/30.pal delete mode 100644 graphics/misc/sunny_day/31.pal delete mode 100644 graphics/misc/sunny_day/32.pal delete mode 100644 graphics/misc/sunny_day/33.pal delete mode 100644 graphics/misc/sunny_day/34.pal delete mode 100644 graphics/misc/sunny_day/35.pal delete mode 100644 graphics/misc/sunny_day/36.pal delete mode 100644 graphics/misc/sunny_day/37.pal delete mode 100644 graphics/misc/sunny_day/38.pal delete mode 100644 graphics/misc/sunny_day/39.pal delete mode 100644 graphics/misc/sunny_day/4.pal delete mode 100644 graphics/misc/sunny_day/40.pal delete mode 100644 graphics/misc/sunny_day/41.pal delete mode 100644 graphics/misc/sunny_day/42.pal delete mode 100644 graphics/misc/sunny_day/43.pal delete mode 100644 graphics/misc/sunny_day/44.pal delete mode 100644 graphics/misc/sunny_day/45.pal delete mode 100644 graphics/misc/sunny_day/46.pal delete mode 100644 graphics/misc/sunny_day/47.pal delete mode 100644 graphics/misc/sunny_day/48.pal delete mode 100644 graphics/misc/sunny_day/49.pal delete mode 100644 graphics/misc/sunny_day/5.pal delete mode 100644 graphics/misc/sunny_day/50.pal delete mode 100644 graphics/misc/sunny_day/51.pal delete mode 100644 graphics/misc/sunny_day/52.pal delete mode 100644 graphics/misc/sunny_day/53.pal delete mode 100644 graphics/misc/sunny_day/54.pal delete mode 100644 graphics/misc/sunny_day/55.pal delete mode 100644 graphics/misc/sunny_day/56.pal delete mode 100644 graphics/misc/sunny_day/57.pal delete mode 100644 graphics/misc/sunny_day/58.pal delete mode 100644 graphics/misc/sunny_day/59.pal delete mode 100644 graphics/misc/sunny_day/6.pal delete mode 100644 graphics/misc/sunny_day/60.pal delete mode 100644 graphics/misc/sunny_day/61.pal delete mode 100644 graphics/misc/sunny_day/62.pal delete mode 100644 graphics/misc/sunny_day/63.pal delete mode 100644 graphics/misc/sunny_day/64.pal delete mode 100644 graphics/misc/sunny_day/65.pal delete mode 100644 graphics/misc/sunny_day/66.pal delete mode 100644 graphics/misc/sunny_day/67.pal delete mode 100644 graphics/misc/sunny_day/68.pal delete mode 100644 graphics/misc/sunny_day/69.pal delete mode 100644 graphics/misc/sunny_day/7.pal delete mode 100644 graphics/misc/sunny_day/70.pal delete mode 100644 graphics/misc/sunny_day/71.pal delete mode 100644 graphics/misc/sunny_day/72.pal delete mode 100644 graphics/misc/sunny_day/73.pal delete mode 100644 graphics/misc/sunny_day/74.pal delete mode 100644 graphics/misc/sunny_day/75.pal delete mode 100644 graphics/misc/sunny_day/76.pal delete mode 100644 graphics/misc/sunny_day/77.pal delete mode 100644 graphics/misc/sunny_day/78.pal delete mode 100644 graphics/misc/sunny_day/79.pal delete mode 100644 graphics/misc/sunny_day/8.pal delete mode 100644 graphics/misc/sunny_day/80.pal delete mode 100644 graphics/misc/sunny_day/81.pal delete mode 100644 graphics/misc/sunny_day/82.pal delete mode 100644 graphics/misc/sunny_day/83.pal delete mode 100644 graphics/misc/sunny_day/84.pal delete mode 100644 graphics/misc/sunny_day/85.pal delete mode 100644 graphics/misc/sunny_day/86.pal delete mode 100644 graphics/misc/sunny_day/87.pal delete mode 100644 graphics/misc/sunny_day/88.pal delete mode 100644 graphics/misc/sunny_day/89.pal delete mode 100644 graphics/misc/sunny_day/9.pal delete mode 100644 graphics/misc/sunny_day/90.pal delete mode 100644 graphics/misc/sunny_day/91.pal delete mode 100644 graphics/misc/sunny_day/92.pal delete mode 100644 graphics/misc/sunny_day/93.pal delete mode 100644 graphics/misc/sunny_day/94.pal delete mode 100644 graphics/misc/sunny_day/95.pal create mode 100644 graphics/weather/drought/0.gbapal create mode 100644 graphics/weather/drought/1.gbapal create mode 100644 graphics/weather/drought/2.gbapal create mode 100644 graphics/weather/drought/3.gbapal create mode 100644 graphics/weather/drought/4.gbapal create mode 100644 graphics/weather/drought/5.gbapal diff --git a/data/fanfares.s b/data/fanfares.s deleted file mode 100644 index 2a0c2576a7..0000000000 --- a/data/fanfares.s +++ /dev/null @@ -1,26 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -sFanfares:: @ 85248BC -@ song number, duration - .2byte 0x016f, 0x0050 - .2byte 0x0172, 0x00a0 - .2byte 0x0173, 0x00dc - .2byte 0x0174, 0x00dc - .2byte 0x0170, 0x00a0 - .2byte 0x0171, 0x0154 - .2byte 0x017a, 0x00b4 - .2byte 0x0183, 0x0078 - .2byte 0x0184, 0x02c6 - .2byte 0x0185, 0x00fa - .2byte 0x0186, 0x0096 - .2byte 0x0187, 0x00a0 - .2byte 0x0226, 0x01c2 - .2byte 0x0212, 0x00aa - .2byte 0x0211, 0x00c4 - .2byte 0x01cb, 0x0139 - .2byte 0x01d2, 0x013e - .2byte 0x01cc, 0x0087 diff --git a/data/field_weather.s b/data/field_weather.s deleted file mode 100644 index 2121ecf23d..0000000000 --- a/data/field_weather.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0854014C:: @ 854014C - .incbin "graphics/misc/sunny_day/0.gbapal" - .incbin "graphics/misc/sunny_day/1.gbapal" - .incbin "graphics/misc/sunny_day/2.gbapal" - .incbin "graphics/misc/sunny_day/3.gbapal" - .incbin "graphics/misc/sunny_day/4.gbapal" - .incbin "graphics/misc/sunny_day/5.gbapal" - .incbin "graphics/misc/sunny_day/6.gbapal" - .incbin "graphics/misc/sunny_day/7.gbapal" - .incbin "graphics/misc/sunny_day/8.gbapal" - .incbin "graphics/misc/sunny_day/9.gbapal" - .incbin "graphics/misc/sunny_day/10.gbapal" - .incbin "graphics/misc/sunny_day/11.gbapal" - .incbin "graphics/misc/sunny_day/12.gbapal" - .incbin "graphics/misc/sunny_day/13.gbapal" - .incbin "graphics/misc/sunny_day/14.gbapal" - .incbin "graphics/misc/sunny_day/15.gbapal" - .incbin "graphics/misc/sunny_day/16.gbapal" - .incbin "graphics/misc/sunny_day/17.gbapal" - .incbin "graphics/misc/sunny_day/18.gbapal" - .incbin "graphics/misc/sunny_day/19.gbapal" - .incbin "graphics/misc/sunny_day/20.gbapal" - .incbin "graphics/misc/sunny_day/21.gbapal" - .incbin "graphics/misc/sunny_day/22.gbapal" - .incbin "graphics/misc/sunny_day/23.gbapal" - .incbin "graphics/misc/sunny_day/24.gbapal" - .incbin "graphics/misc/sunny_day/25.gbapal" - .incbin "graphics/misc/sunny_day/26.gbapal" - .incbin "graphics/misc/sunny_day/27.gbapal" - .incbin "graphics/misc/sunny_day/28.gbapal" - .incbin "graphics/misc/sunny_day/29.gbapal" - .incbin "graphics/misc/sunny_day/30.gbapal" - .incbin "graphics/misc/sunny_day/31.gbapal" - .incbin "graphics/misc/sunny_day/32.gbapal" - .incbin "graphics/misc/sunny_day/33.gbapal" - .incbin "graphics/misc/sunny_day/34.gbapal" - .incbin "graphics/misc/sunny_day/35.gbapal" - .incbin "graphics/misc/sunny_day/36.gbapal" - .incbin "graphics/misc/sunny_day/37.gbapal" - .incbin "graphics/misc/sunny_day/38.gbapal" - .incbin "graphics/misc/sunny_day/39.gbapal" - .incbin "graphics/misc/sunny_day/40.gbapal" - .incbin "graphics/misc/sunny_day/41.gbapal" - .incbin "graphics/misc/sunny_day/42.gbapal" - .incbin "graphics/misc/sunny_day/43.gbapal" - .incbin "graphics/misc/sunny_day/44.gbapal" - .incbin "graphics/misc/sunny_day/45.gbapal" - .incbin "graphics/misc/sunny_day/46.gbapal" - .incbin "graphics/misc/sunny_day/47.gbapal" - .incbin "graphics/misc/sunny_day/48.gbapal" - .incbin "graphics/misc/sunny_day/49.gbapal" - .incbin "graphics/misc/sunny_day/50.gbapal" - .incbin "graphics/misc/sunny_day/51.gbapal" - .incbin "graphics/misc/sunny_day/52.gbapal" - .incbin "graphics/misc/sunny_day/53.gbapal" - .incbin "graphics/misc/sunny_day/54.gbapal" - .incbin "graphics/misc/sunny_day/55.gbapal" - .incbin "graphics/misc/sunny_day/56.gbapal" - .incbin "graphics/misc/sunny_day/57.gbapal" - .incbin "graphics/misc/sunny_day/58.gbapal" - .incbin "graphics/misc/sunny_day/59.gbapal" - .incbin "graphics/misc/sunny_day/60.gbapal" - .incbin "graphics/misc/sunny_day/61.gbapal" - .incbin "graphics/misc/sunny_day/62.gbapal" - .incbin "graphics/misc/sunny_day/63.gbapal" - .incbin "graphics/misc/sunny_day/64.gbapal" - .incbin "graphics/misc/sunny_day/65.gbapal" - .incbin "graphics/misc/sunny_day/66.gbapal" - .incbin "graphics/misc/sunny_day/67.gbapal" - .incbin "graphics/misc/sunny_day/68.gbapal" - .incbin "graphics/misc/sunny_day/69.gbapal" - .incbin "graphics/misc/sunny_day/70.gbapal" - .incbin "graphics/misc/sunny_day/71.gbapal" - .incbin "graphics/misc/sunny_day/72.gbapal" - .incbin "graphics/misc/sunny_day/73.gbapal" - .incbin "graphics/misc/sunny_day/74.gbapal" - .incbin "graphics/misc/sunny_day/75.gbapal" - .incbin "graphics/misc/sunny_day/76.gbapal" - .incbin "graphics/misc/sunny_day/77.gbapal" - .incbin "graphics/misc/sunny_day/78.gbapal" - .incbin "graphics/misc/sunny_day/79.gbapal" - .incbin "graphics/misc/sunny_day/80.gbapal" - .incbin "graphics/misc/sunny_day/81.gbapal" - .incbin "graphics/misc/sunny_day/82.gbapal" - .incbin "graphics/misc/sunny_day/83.gbapal" - .incbin "graphics/misc/sunny_day/84.gbapal" - .incbin "graphics/misc/sunny_day/85.gbapal" - .incbin "graphics/misc/sunny_day/86.gbapal" - .incbin "graphics/misc/sunny_day/87.gbapal" - .incbin "graphics/misc/sunny_day/88.gbapal" - .incbin "graphics/misc/sunny_day/89.gbapal" - .incbin "graphics/misc/sunny_day/90.gbapal" - .incbin "graphics/misc/sunny_day/91.gbapal" - .incbin "graphics/misc/sunny_day/92.gbapal" - .incbin "graphics/misc/sunny_day/93.gbapal" - .incbin "graphics/misc/sunny_day/94.gbapal" - .incbin "graphics/misc/sunny_day/95.gbapal" diff --git a/graphics/misc/sunny_day/0.pal b/graphics/misc/sunny_day/0.pal deleted file mode 100644 index 54f6a9ac04..0000000000 --- a/graphics/misc/sunny_day/0.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 8 -24 8 8 -41 8 8 -57 8 8 -74 8 8 -90 8 8 -106 8 8 -139 0 0 -156 0 0 -172 0 0 -189 0 0 -205 0 0 -222 0 0 -238 0 0 -255 0 0 -255 24 24 -8 24 8 -24 24 8 -41 24 8 -57 24 8 -74 24 8 -90 24 8 -106 24 8 -139 16 0 -156 16 0 -172 16 0 -189 16 0 -205 16 0 -222 16 0 -238 16 0 -255 16 0 -255 32 24 -8 41 8 -24 41 8 -41 41 8 -57 41 8 -74 41 8 -90 41 8 -106 41 8 -139 41 0 -156 41 0 -172 32 0 -189 32 0 -205 32 0 -222 32 0 -238 32 0 -255 32 0 -255 49 24 -8 57 8 -24 57 8 -41 57 8 -57 57 8 -74 57 8 -90 57 8 -106 57 8 -139 57 0 -156 57 0 -172 57 0 -189 49 0 -205 57 0 -222 57 0 -238 49 0 -255 49 0 -255 65 24 -8 74 8 -24 74 8 -41 74 8 -57 74 8 -74 74 8 -90 74 8 -106 74 8 -139 74 0 -156 74 0 -172 74 0 -189 74 0 -205 74 0 -222 65 0 -238 74 0 -255 74 0 -255 82 24 -8 90 8 -24 90 8 -41 90 8 -57 90 8 -74 90 8 -90 90 8 -106 90 8 -139 98 0 -156 98 0 -172 90 0 -189 90 0 -205 90 0 -222 90 0 -238 90 0 -255 90 0 -255 98 24 -8 106 8 -24 106 8 -41 106 8 -57 106 8 -74 106 8 -90 106 8 -106 106 8 -139 115 0 -156 115 0 -172 115 0 -189 106 0 -205 106 0 -222 115 0 -238 106 0 -255 106 0 -255 115 24 -0 139 0 -24 139 0 -41 139 0 -57 139 0 -82 139 0 -98 139 0 -115 139 0 -139 139 0 -156 131 0 -172 131 0 -189 131 0 -205 123 0 -222 123 0 -238 131 0 -255 131 0 -255 131 24 -0 156 0 -24 156 0 -41 156 0 -57 156 0 -74 156 0 -98 156 0 -115 156 0 -139 156 0 -156 156 0 -172 148 0 -189 148 0 -205 148 0 -222 148 0 -238 148 0 -255 148 0 -255 148 24 -0 172 0 -16 172 0 -41 172 0 -57 172 0 -74 172 0 -98 172 0 -115 172 0 -131 172 0 -156 172 0 -172 172 0 -189 164 0 -205 164 0 -222 164 0 -238 164 0 -255 164 0 -255 164 24 -0 189 0 -16 189 0 -41 189 0 -57 189 0 -74 189 0 -90 189 0 -115 189 0 -131 189 0 -148 189 0 -172 189 0 -189 189 0 -205 189 0 -222 180 0 -238 180 0 -255 180 0 -255 180 24 -0 205 0 -16 205 0 -32 205 0 -57 205 0 -74 205 0 -98 205 0 -115 205 0 -131 205 0 -148 205 0 -172 205 0 -189 205 0 -205 205 0 -222 205 0 -238 197 0 -255 205 0 -255 189 24 -0 222 0 -16 222 0 -32 222 0 -57 222 0 -74 222 0 -90 222 0 -115 222 0 -131 222 0 -148 222 0 -164 222 0 -189 222 0 -205 222 0 -222 222 0 -238 222 0 -255 222 0 -255 205 24 -0 238 0 -16 238 0 -41 238 0 -57 238 0 -74 238 0 -90 238 0 -115 238 0 -131 238 0 -148 238 0 -172 238 0 -189 238 0 -205 238 0 -222 238 0 -238 238 0 -255 238 0 -255 222 24 -0 255 0 -16 255 0 -41 255 0 -57 255 0 -74 255 0 -90 255 0 -106 255 0 -131 255 0 -148 255 0 -164 255 0 -180 255 0 -205 255 0 -222 255 0 -238 255 0 -255 255 0 -255 238 24 -24 255 24 -41 255 24 -57 255 24 -74 255 24 -90 255 24 -106 255 24 -115 255 24 -131 255 24 -148 255 24 -164 255 24 -180 255 24 -197 255 24 -213 255 24 -230 255 24 -246 255 24 -255 255 24 diff --git a/graphics/misc/sunny_day/1.pal b/graphics/misc/sunny_day/1.pal deleted file mode 100644 index 23fd665ef3..0000000000 --- a/graphics/misc/sunny_day/1.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 24 -24 8 24 -41 8 24 -57 8 24 -74 8 24 -90 8 24 -106 8 24 -139 0 24 -156 0 24 -172 0 16 -189 0 16 -205 0 16 -222 0 16 -238 0 16 -255 0 16 -255 24 41 -8 24 24 -24 24 24 -41 24 24 -57 24 24 -74 24 24 -90 24 24 -115 16 16 -131 16 16 -156 16 16 -172 16 16 -189 16 16 -205 16 16 -222 16 16 -238 16 16 -246 32 32 -255 41 41 -8 41 24 -24 41 24 -41 41 24 -57 41 24 -74 41 24 -90 41 24 -115 41 16 -131 41 16 -156 41 16 -172 32 16 -189 32 16 -205 32 16 -222 32 16 -238 32 16 -246 49 32 -255 57 41 -8 57 24 -24 57 24 -41 57 24 -57 57 24 -74 57 24 -90 57 24 -115 57 16 -131 57 16 -156 57 16 -172 57 16 -189 57 16 -205 49 16 -222 49 16 -238 49 16 -246 65 32 -255 74 41 -8 74 24 -24 74 24 -41 74 24 -57 74 24 -74 74 24 -90 74 24 -115 74 16 -131 74 16 -156 74 16 -172 74 16 -189 74 16 -205 65 16 -222 74 16 -238 74 16 -246 82 32 -255 82 41 -8 90 24 -24 90 24 -41 90 24 -57 90 24 -74 90 24 -90 90 24 -115 98 16 -131 98 16 -156 98 16 -172 90 16 -189 90 16 -205 90 16 -222 90 16 -238 90 16 -246 98 32 -255 106 41 -8 106 24 -16 115 16 -41 115 16 -57 115 16 -82 115 16 -98 115 16 -115 115 16 -131 115 16 -156 115 16 -172 115 16 -189 115 16 -205 115 16 -222 106 16 -238 106 16 -246 115 32 -255 115 41 -0 139 16 -16 131 16 -41 131 16 -57 131 16 -74 131 16 -98 131 16 -115 131 16 -131 131 16 -156 131 16 -172 131 16 -189 131 16 -205 123 16 -222 123 16 -238 131 16 -246 131 32 -255 131 41 -0 156 16 -16 156 16 -41 156 16 -57 156 16 -74 156 16 -98 156 16 -115 156 16 -131 156 16 -156 156 16 -172 148 16 -189 148 16 -205 148 16 -222 148 16 -238 139 16 -246 148 32 -255 148 41 -0 172 16 -16 172 16 -41 172 16 -57 172 16 -74 172 16 -90 172 16 -115 172 16 -131 172 16 -156 172 16 -172 172 16 -189 172 16 -205 164 16 -222 164 16 -238 164 16 -246 164 32 -255 164 41 -0 189 16 -16 189 16 -32 189 16 -57 189 16 -74 189 16 -90 189 16 -115 189 16 -131 189 16 -148 189 16 -172 189 16 -189 189 16 -205 180 16 -222 180 16 -238 180 16 -246 180 32 -255 180 41 -0 205 16 -16 205 16 -32 205 16 -57 205 16 -74 205 16 -90 205 16 -115 205 16 -131 205 16 -148 205 16 -172 205 16 -189 205 16 -205 205 16 -222 205 16 -238 197 16 -246 197 32 -255 197 41 -0 222 16 -16 222 16 -32 222 16 -57 222 16 -74 222 16 -90 222 16 -115 222 16 -131 222 16 -148 222 16 -172 222 16 -189 222 16 -205 222 16 -222 222 16 -238 222 16 -246 213 32 -255 213 41 -0 238 16 -16 238 16 -32 238 16 -57 238 16 -74 238 16 -90 238 16 -106 238 16 -131 238 16 -148 238 16 -164 238 16 -180 238 16 -205 238 16 -222 238 16 -238 238 16 -246 230 32 -255 230 41 -0 255 16 -32 246 32 -49 246 32 -65 246 32 -82 246 32 -98 246 32 -115 246 32 -131 246 32 -156 246 32 -164 246 32 -189 246 32 -197 246 32 -213 246 32 -238 246 32 -246 246 32 -255 238 41 -24 255 32 -41 255 41 -57 255 41 -74 255 41 -90 255 41 -106 255 41 -123 255 41 -139 255 41 -148 255 41 -164 255 41 -180 255 41 -197 255 41 -213 255 41 -230 255 41 -246 255 41 -255 255 41 diff --git a/graphics/misc/sunny_day/10.pal b/graphics/misc/sunny_day/10.pal deleted file mode 100644 index cf290d63b4..0000000000 --- a/graphics/misc/sunny_day/10.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 189 -16 0 189 -32 0 189 -49 0 189 -74 0 189 -90 0 189 -106 0 189 -131 0 189 -148 0 189 -164 0 189 -189 0 189 -205 0 189 -222 0 189 -238 0 189 -255 0 180 -255 24 180 -0 16 189 -16 16 189 -32 16 189 -57 16 189 -74 16 189 -90 16 189 -115 16 189 -131 16 189 -148 16 189 -172 16 189 -189 16 189 -205 16 189 -222 16 189 -238 16 180 -246 32 189 -255 41 180 -0 41 189 -16 32 189 -32 32 189 -49 32 189 -74 32 189 -90 32 189 -115 32 189 -131 32 189 -148 32 189 -164 32 189 -189 32 189 -205 32 189 -222 32 180 -230 49 180 -246 49 180 -255 57 180 -0 57 189 -16 57 189 -32 57 189 -49 49 189 -74 49 189 -90 49 189 -106 49 189 -131 49 189 -148 49 189 -164 49 189 -189 49 189 -205 57 189 -213 65 180 -230 65 180 -246 65 180 -255 74 180 -0 74 189 -16 74 189 -32 74 189 -49 74 189 -74 74 180 -90 74 180 -106 74 180 -131 74 180 -148 74 180 -164 74 180 -180 74 180 -197 82 180 -213 82 180 -230 82 180 -246 82 180 -255 90 180 -0 90 189 -16 90 189 -32 90 189 -49 90 189 -74 90 180 -98 98 180 -115 98 180 -131 98 180 -148 98 180 -164 98 180 -180 98 180 -197 98 180 -213 98 180 -230 98 180 -246 106 189 -255 106 180 -0 115 189 -16 115 189 -32 115 189 -49 106 189 -74 106 180 -98 115 180 -115 115 180 -131 115 180 -148 115 180 -164 115 180 -180 115 180 -197 115 180 -213 115 180 -230 123 189 -246 123 180 -255 123 189 -0 131 189 -16 131 189 -32 131 189 -49 131 189 -74 131 180 -98 131 180 -115 131 180 -139 139 180 -148 139 180 -164 139 180 -180 139 180 -197 131 180 -213 139 180 -230 139 180 -246 139 189 -255 139 189 -0 148 189 -16 148 189 -32 148 189 -49 148 189 -74 148 180 -98 148 180 -115 148 180 -139 148 180 -156 156 180 -164 156 180 -180 156 180 -197 148 180 -213 156 180 -230 156 180 -246 156 189 -255 172 197 -0 172 189 -16 172 189 -32 172 189 -49 172 189 -74 164 180 -98 164 180 -115 164 180 -139 164 180 -156 164 180 -164 164 180 -180 164 180 -197 172 180 -213 172 189 -230 172 189 -246 180 197 -255 189 197 -0 189 189 -16 189 189 -32 189 189 -49 189 189 -74 180 180 -98 180 180 -115 180 180 -139 180 180 -156 180 180 -164 180 180 -180 180 180 -197 189 189 -213 189 189 -238 197 197 -246 197 197 -255 205 205 -0 205 189 -16 205 180 -32 205 180 -57 205 180 -82 197 180 -98 197 180 -115 197 180 -131 197 180 -148 197 180 -172 197 180 -189 197 189 -197 197 189 -213 197 189 -238 205 197 -246 213 197 -255 213 205 -0 222 180 -16 222 180 -32 222 180 -65 213 180 -82 213 180 -98 213 180 -115 213 180 -139 213 180 -156 213 180 -172 213 180 -189 213 189 -197 213 189 -213 213 189 -238 222 197 -246 222 197 -255 222 205 -0 238 180 -16 238 180 -49 230 180 -65 230 180 -82 230 180 -98 230 180 -123 230 180 -139 230 180 -156 230 180 -172 230 189 -197 238 197 -205 238 197 -222 238 197 -238 238 197 -246 238 197 -255 238 205 -0 255 180 -32 246 180 -49 246 180 -65 246 180 -82 246 180 -106 246 180 -123 246 180 -139 246 180 -156 246 180 -180 246 197 -197 246 197 -213 246 197 -222 246 197 -238 246 197 -246 246 197 -255 246 205 -24 255 180 -41 255 180 -57 255 180 -74 255 180 -90 255 180 -106 255 180 -123 255 180 -139 255 189 -172 255 197 -189 255 197 -205 255 205 -213 255 205 -230 255 205 -238 255 205 -246 255 205 -255 255 205 diff --git a/graphics/misc/sunny_day/11.pal b/graphics/misc/sunny_day/11.pal deleted file mode 100644 index 2536a3423b..0000000000 --- a/graphics/misc/sunny_day/11.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 205 -16 0 205 -32 0 205 -57 0 205 -74 0 205 -90 0 205 -106 0 205 -123 0 205 -148 0 205 -164 0 205 -189 0 205 -205 0 205 -222 0 205 -238 0 205 -255 0 205 -255 24 197 -0 16 205 -16 16 205 -32 16 205 -49 16 205 -65 16 205 -90 16 205 -115 16 205 -123 16 205 -148 16 205 -164 16 205 -180 16 205 -205 16 205 -222 16 205 -238 16 205 -246 32 197 -255 41 197 -0 32 205 -16 32 205 -32 32 205 -49 32 205 -74 32 205 -90 32 205 -106 32 205 -131 32 205 -148 32 205 -164 32 205 -180 32 205 -205 32 205 -222 32 205 -230 49 197 -246 49 197 -255 57 197 -0 57 205 -16 57 205 -32 57 205 -57 57 205 -74 57 205 -90 57 205 -106 57 205 -131 57 205 -148 57 205 -164 57 205 -180 57 205 -205 57 205 -213 65 205 -230 65 197 -246 65 197 -255 74 197 -0 74 205 -16 74 205 -32 74 205 -57 74 205 -82 82 197 -98 82 197 -115 82 197 -131 82 197 -148 82 197 -164 82 197 -180 82 197 -197 82 197 -213 82 197 -230 82 197 -246 82 197 -255 90 197 -0 98 205 -16 90 205 -32 90 205 -57 90 205 -82 98 197 -98 98 197 -115 98 197 -131 98 197 -148 98 197 -164 98 197 -180 98 197 -197 98 197 -213 98 197 -230 98 197 -246 106 197 -255 106 197 -0 115 205 -16 115 205 -32 115 205 -57 106 205 -82 115 197 -98 115 197 -115 115 197 -131 115 197 -148 115 197 -164 115 197 -180 115 197 -197 115 197 -213 115 197 -230 123 197 -246 123 197 -255 123 205 -0 131 205 -16 131 205 -32 131 205 -57 131 205 -82 131 197 -98 131 197 -115 131 197 -131 131 197 -148 131 197 -164 131 197 -180 131 197 -197 131 197 -213 139 197 -230 139 197 -246 139 205 -255 139 197 -0 148 205 -16 148 205 -32 148 205 -57 148 205 -82 148 197 -98 148 197 -115 148 197 -131 148 197 -148 148 197 -164 148 197 -180 148 197 -197 148 197 -213 156 197 -230 156 197 -246 156 197 -255 172 205 -0 172 205 -16 172 205 -32 164 205 -57 164 205 -82 164 197 -98 164 197 -115 164 197 -131 164 197 -148 164 197 -172 172 197 -180 172 197 -197 172 197 -213 172 197 -230 172 197 -246 180 205 -255 189 213 -0 189 205 -16 189 205 -32 189 205 -57 189 205 -82 180 197 -98 180 197 -115 180 197 -131 180 197 -148 180 197 -172 180 197 -189 189 197 -197 189 197 -213 189 197 -238 197 205 -246 197 213 -255 205 213 -0 205 205 -16 205 205 -32 205 205 -57 205 205 -82 197 197 -98 197 197 -115 197 197 -131 197 197 -148 197 197 -172 197 197 -189 197 197 -197 197 197 -222 205 205 -238 213 213 -246 213 213 -255 222 222 -0 222 205 -16 222 205 -32 222 197 -65 213 197 -82 213 197 -98 213 197 -115 213 197 -139 213 197 -156 213 197 -172 213 197 -189 213 197 -205 222 205 -222 222 205 -238 222 213 -246 222 213 -255 230 222 -0 238 197 -16 238 197 -49 230 197 -65 230 197 -82 230 197 -98 230 197 -123 230 197 -139 230 197 -156 230 197 -172 230 197 -197 238 205 -213 238 213 -222 238 213 -238 238 213 -246 238 213 -255 238 222 -0 255 205 -32 246 197 -49 246 197 -65 246 197 -82 246 197 -106 246 197 -123 246 197 -139 246 197 -156 246 197 -180 246 205 -197 246 213 -213 246 213 -230 246 213 -238 246 213 -246 246 213 -255 246 222 -24 255 189 -41 255 197 -57 255 197 -74 255 197 -90 255 197 -106 255 197 -123 255 197 -139 255 197 -172 255 205 -189 255 213 -205 255 213 -222 255 222 -230 255 222 -238 255 222 -246 255 222 -255 255 222 diff --git a/graphics/misc/sunny_day/12.pal b/graphics/misc/sunny_day/12.pal deleted file mode 100644 index 2b54d05cb1..0000000000 --- a/graphics/misc/sunny_day/12.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 222 -16 0 222 -32 0 222 -57 0 222 -65 0 222 -90 0 222 -115 0 222 -123 0 222 -148 0 222 -164 0 222 -180 0 222 -205 0 222 -222 0 222 -238 0 222 -255 0 222 -255 24 213 -0 16 222 -16 16 222 -32 16 222 -49 16 222 -74 16 222 -90 16 222 -106 16 222 -123 16 222 -148 16 222 -164 16 222 -180 16 222 -205 16 222 -222 16 222 -238 16 222 -246 32 213 -255 41 213 -0 32 222 -16 32 222 -32 32 222 -49 32 222 -65 32 222 -90 32 222 -106 32 222 -131 32 222 -139 32 222 -164 32 222 -180 32 222 -197 32 222 -222 32 222 -230 49 213 -246 49 213 -255 57 213 -0 57 222 -16 57 222 -32 57 222 -65 65 213 -82 65 213 -98 65 213 -115 65 213 -131 65 213 -148 65 213 -164 65 213 -180 65 213 -197 65 213 -213 65 213 -230 65 213 -246 65 213 -255 74 213 -0 74 222 -16 74 222 -32 74 222 -65 82 213 -82 82 213 -98 82 213 -115 82 213 -131 82 213 -148 82 213 -164 82 213 -180 82 213 -197 82 213 -213 82 213 -230 82 213 -246 82 213 -255 90 213 -0 90 222 -16 90 222 -32 90 222 -65 98 213 -82 98 213 -98 98 213 -115 98 213 -131 98 213 -148 98 213 -164 98 213 -180 98 213 -197 98 213 -213 98 213 -230 98 213 -246 106 213 -255 106 213 -0 115 222 -16 115 222 -32 106 222 -65 115 213 -82 115 213 -98 115 213 -115 115 213 -131 115 213 -148 115 213 -164 115 213 -180 115 213 -197 115 213 -213 115 213 -230 123 213 -246 123 213 -255 123 213 -0 131 222 -16 131 222 -32 131 222 -65 131 213 -82 131 213 -98 139 213 -115 131 213 -139 139 213 -148 139 213 -164 139 213 -180 139 213 -197 139 213 -213 139 213 -230 139 213 -246 139 213 -255 139 213 -0 148 222 -16 148 222 -32 148 222 -65 148 213 -82 148 213 -98 148 213 -115 148 213 -139 156 213 -156 156 213 -172 156 213 -180 156 213 -197 156 213 -213 156 213 -230 156 213 -246 156 213 -255 172 222 -0 164 222 -16 172 222 -32 164 222 -65 164 213 -82 164 213 -98 164 213 -115 164 213 -139 164 213 -156 172 213 -172 172 213 -180 172 213 -197 172 213 -213 172 213 -230 172 213 -246 180 222 -255 189 222 -0 189 222 -16 189 222 -32 180 222 -65 180 213 -82 180 213 -98 180 213 -115 180 213 -139 180 213 -156 180 213 -172 189 213 -189 189 213 -197 189 213 -213 189 213 -238 197 222 -246 197 222 -255 205 230 -0 205 222 -16 205 222 -32 205 222 -65 205 213 -82 197 213 -98 197 213 -115 197 213 -139 197 213 -156 197 213 -172 197 213 -189 197 213 -205 205 222 -222 205 222 -238 213 222 -246 213 230 -255 222 230 -0 222 222 -16 222 222 -32 222 222 -65 213 213 -82 213 213 -98 213 213 -115 213 213 -139 213 213 -156 213 213 -172 213 213 -189 213 213 -205 222 222 -222 222 222 -238 230 230 -246 230 230 -255 238 238 -0 238 222 -16 238 222 -49 230 213 -65 230 213 -82 230 213 -98 230 213 -123 230 213 -139 230 213 -156 230 213 -172 230 213 -197 238 222 -213 238 222 -230 238 230 -238 238 230 -246 238 230 -255 246 238 -0 255 222 -32 246 213 -49 246 213 -65 246 213 -82 246 213 -106 246 213 -123 246 213 -139 246 213 -156 246 213 -180 246 222 -197 246 222 -213 246 222 -230 246 230 -238 246 230 -246 246 230 -255 255 238 -24 255 205 -41 255 213 -57 255 205 -74 255 213 -90 255 213 -106 255 213 -123 255 213 -139 255 213 -172 255 222 -189 255 222 -205 255 222 -222 255 230 -238 255 238 -246 255 238 -255 255 238 -255 255 238 diff --git a/graphics/misc/sunny_day/13.pal b/graphics/misc/sunny_day/13.pal deleted file mode 100644 index caf0a75451..0000000000 --- a/graphics/misc/sunny_day/13.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 238 -16 0 238 -32 0 238 -49 0 238 -74 0 238 -90 0 238 -106 0 238 -131 0 238 -148 0 238 -164 0 238 -180 0 238 -197 0 238 -222 0 238 -238 0 238 -255 0 238 -255 24 230 -0 16 238 -16 16 238 -32 16 238 -49 16 238 -74 16 238 -90 16 238 -106 16 238 -131 16 238 -139 16 238 -164 16 238 -180 16 238 -197 16 238 -222 16 238 -238 16 238 -246 32 238 -255 41 230 -0 41 238 -16 32 238 -49 49 230 -65 49 230 -82 49 230 -98 49 230 -115 49 230 -131 49 230 -148 49 230 -164 49 230 -180 49 230 -197 49 230 -213 49 230 -230 49 230 -246 49 230 -255 57 230 -0 57 238 -16 57 238 -49 65 230 -65 65 230 -82 65 230 -98 65 230 -115 65 230 -131 65 230 -148 65 230 -164 65 230 -180 65 230 -197 65 230 -213 65 230 -230 65 230 -246 65 238 -255 74 230 -0 74 238 -16 74 238 -49 82 230 -65 82 230 -82 82 230 -98 82 230 -115 82 230 -131 82 230 -148 82 230 -164 82 230 -180 82 230 -197 82 230 -213 82 230 -230 82 230 -246 82 230 -255 90 230 -0 90 238 -16 90 238 -49 106 230 -65 98 230 -82 98 230 -98 98 230 -115 98 230 -131 98 230 -148 98 230 -164 98 230 -180 98 230 -197 98 230 -213 98 230 -230 98 230 -246 106 230 -255 106 230 -0 115 238 -16 106 238 -49 115 230 -65 115 230 -82 123 230 -98 123 230 -123 123 230 -131 123 230 -148 123 230 -164 123 230 -180 123 230 -197 123 230 -213 123 230 -230 123 230 -246 123 230 -255 123 230 -0 131 238 -16 131 238 -49 139 230 -65 131 230 -82 131 230 -98 131 230 -123 139 230 -139 139 230 -148 139 230 -164 139 230 -180 139 230 -197 139 230 -213 139 230 -230 139 230 -246 139 230 -255 139 230 -0 148 238 -16 148 238 -49 148 230 -65 148 230 -82 148 230 -98 156 230 -123 156 230 -139 156 230 -156 156 230 -164 156 230 -180 156 230 -197 156 230 -213 156 230 -230 156 230 -246 156 230 -255 172 230 -0 172 238 -16 164 238 -49 164 230 -65 164 230 -82 172 230 -98 164 230 -123 164 230 -139 164 230 -156 172 230 -172 172 230 -189 172 230 -197 172 230 -213 172 230 -230 172 230 -246 180 238 -255 189 238 -0 189 238 -16 180 238 -49 180 230 -65 180 230 -82 180 230 -98 180 230 -123 189 230 -139 180 230 -156 180 230 -172 189 230 -197 197 238 -205 197 238 -222 197 238 -238 197 238 -246 197 238 -255 205 238 -0 205 238 -16 205 238 -49 197 230 -65 197 230 -82 197 230 -98 197 230 -123 197 230 -139 197 230 -156 197 230 -172 197 230 -197 205 238 -213 213 238 -222 213 238 -238 213 238 -246 213 238 -255 222 238 -0 222 238 -16 222 238 -49 213 230 -65 213 230 -82 213 230 -98 213 230 -123 213 230 -139 213 230 -156 213 230 -172 213 230 -197 222 238 -213 222 238 -230 230 238 -238 230 238 -246 230 238 -255 238 246 -0 238 238 -16 238 238 -49 230 230 -65 230 230 -82 230 230 -98 230 230 -123 230 230 -139 230 230 -156 230 230 -172 230 230 -197 238 238 -213 238 238 -230 238 238 -238 238 238 -255 246 246 -255 255 255 -0 255 238 -32 246 230 -49 246 230 -65 246 230 -82 246 230 -106 246 230 -123 246 230 -139 246 230 -156 246 230 -180 246 230 -197 246 238 -213 246 238 -230 246 238 -246 255 246 -255 255 246 -255 255 255 -24 255 222 -41 255 230 -57 255 222 -74 255 222 -90 255 222 -106 255 230 -123 255 230 -139 255 230 -172 255 230 -189 255 230 -205 255 238 -222 255 238 -238 255 246 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/14.pal b/graphics/misc/sunny_day/14.pal deleted file mode 100644 index c8d66ade5f..0000000000 --- a/graphics/misc/sunny_day/14.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 255 -16 0 255 -32 0 255 -49 0 255 -74 0 255 -90 0 255 -106 0 255 -131 0 255 -148 0 255 -164 0 255 -180 0 255 -205 0 255 -222 0 255 -238 0 255 -255 0 255 -255 24 246 -0 16 255 -32 32 246 -49 32 246 -65 32 246 -82 32 246 -98 32 246 -115 32 246 -131 32 246 -148 32 246 -164 32 246 -180 32 246 -197 32 246 -213 32 246 -230 32 246 -246 32 246 -255 41 246 -0 41 255 -32 49 246 -49 49 246 -65 49 246 -82 49 246 -98 49 246 -115 49 246 -131 49 246 -148 49 246 -164 49 246 -180 49 246 -197 49 246 -213 49 246 -230 49 246 -246 49 246 -255 57 246 -0 57 255 -32 65 246 -49 65 246 -65 65 246 -82 65 246 -98 65 246 -115 65 246 -131 65 246 -148 65 246 -164 65 246 -180 65 246 -197 65 246 -213 65 246 -230 65 246 -246 65 246 -255 74 246 -0 74 255 -32 82 246 -49 82 246 -65 90 246 -82 82 246 -98 82 246 -115 82 246 -131 82 246 -148 82 246 -164 82 246 -180 82 246 -197 82 246 -213 82 246 -230 82 246 -246 82 246 -255 90 246 -0 90 255 -32 98 246 -49 98 246 -65 98 246 -82 98 246 -106 106 246 -115 106 246 -131 106 246 -148 106 246 -164 106 246 -180 106 246 -197 106 246 -213 106 246 -230 106 246 -246 106 246 -255 106 246 -0 106 255 -32 115 246 -49 115 246 -65 123 246 -82 115 246 -106 123 246 -123 123 246 -131 123 246 -156 123 246 -164 123 246 -180 123 246 -197 123 246 -213 123 246 -230 123 246 -246 123 246 -255 123 246 -0 131 255 -32 131 246 -49 131 246 -65 131 246 -82 131 246 -106 139 246 -123 139 246 -139 139 246 -156 139 246 -172 139 246 -180 139 246 -197 139 246 -213 139 246 -230 139 246 -246 139 246 -255 139 246 -0 148 255 -32 156 246 -49 148 246 -65 156 246 -82 148 246 -106 148 246 -123 156 246 -139 156 246 -156 156 246 -172 156 246 -180 156 246 -197 156 246 -213 156 246 -230 156 246 -246 156 246 -255 172 246 -0 164 255 -32 164 246 -49 164 246 -65 164 246 -82 164 246 -106 172 246 -123 172 246 -139 172 246 -156 172 246 -180 180 246 -197 180 246 -205 180 246 -222 180 246 -230 180 246 -246 180 246 -255 189 246 -0 180 255 -32 189 246 -49 180 246 -65 180 246 -82 180 246 -106 189 246 -123 180 246 -139 189 246 -156 189 246 -180 197 246 -197 197 246 -213 197 246 -222 197 246 -238 197 246 -246 197 246 -255 205 246 -0 205 255 -32 197 246 -49 197 246 -65 197 246 -82 197 246 -106 197 246 -123 197 246 -139 205 246 -156 197 246 -180 205 246 -197 213 246 -213 213 246 -222 213 246 -238 213 246 -246 213 246 -255 222 246 -0 222 255 -32 213 246 -49 213 246 -65 213 246 -82 213 246 -106 213 246 -123 213 246 -139 213 246 -156 213 246 -180 222 246 -197 222 246 -213 230 246 -230 230 246 -238 230 246 -246 230 246 -255 238 255 -0 238 255 -32 238 246 -49 230 246 -65 238 246 -82 230 246 -106 230 246 -123 230 246 -139 230 246 -156 230 246 -180 238 246 -197 238 246 -213 238 246 -230 238 246 -246 246 255 -255 246 255 -255 255 255 -0 255 255 -32 246 246 -49 246 246 -65 246 246 -82 246 246 -106 246 246 -123 246 246 -139 246 246 -156 246 246 -180 246 246 -197 246 246 -213 246 246 -230 246 246 -246 255 255 -255 255 255 -255 255 255 -24 255 238 -41 255 238 -57 255 238 -74 255 238 -90 255 238 -106 255 238 -123 255 246 -139 255 246 -172 255 246 -189 255 246 -205 255 246 -222 255 246 -238 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/15.pal b/graphics/misc/sunny_day/15.pal deleted file mode 100644 index c14fb84deb..0000000000 --- a/graphics/misc/sunny_day/15.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -24 24 255 -32 24 255 -49 24 255 -65 24 255 -82 24 255 -98 24 255 -115 24 255 -131 24 255 -148 24 255 -164 24 255 -180 24 255 -189 24 255 -205 24 255 -222 24 255 -238 24 255 -255 24 255 -24 41 255 -41 41 255 -57 41 255 -74 41 255 -82 41 255 -106 41 255 -115 41 255 -131 41 255 -148 41 255 -164 41 255 -180 41 255 -197 41 255 -213 41 255 -230 41 255 -238 41 255 -255 41 255 -24 57 255 -41 57 255 -57 57 255 -74 57 255 -90 57 255 -98 57 255 -115 57 255 -131 57 255 -148 57 255 -164 57 255 -180 57 255 -197 57 255 -205 57 255 -222 57 255 -238 57 255 -255 57 255 -24 74 255 -41 74 255 -57 74 255 -74 74 255 -90 74 255 -106 74 255 -123 74 255 -131 74 255 -148 74 255 -164 74 255 -180 74 255 -197 74 255 -213 74 255 -222 74 255 -238 74 255 -255 74 255 -24 90 255 -41 90 255 -57 90 255 -74 90 255 -90 90 255 -106 90 255 -123 90 255 -139 90 255 -148 90 255 -164 90 255 -180 90 255 -197 90 255 -213 90 255 -222 90 255 -238 90 255 -255 90 255 -24 106 255 -41 106 255 -57 106 255 -74 106 255 -90 106 255 -106 106 255 -123 106 255 -139 106 255 -148 106 255 -164 106 255 -180 106 255 -197 106 255 -213 106 255 -230 106 255 -238 106 255 -255 106 255 -24 115 255 -41 123 255 -57 123 255 -74 123 255 -90 123 255 -106 123 255 -123 123 255 -139 123 255 -156 123 255 -172 123 255 -180 123 255 -197 123 255 -213 123 255 -230 123 255 -246 123 255 -255 123 255 -24 131 255 -41 139 255 -57 131 255 -74 139 255 -90 139 255 -106 139 255 -123 139 255 -139 139 255 -156 139 255 -172 139 255 -189 139 255 -197 139 255 -213 139 255 -230 139 255 -246 139 255 -255 139 255 -24 148 255 -41 148 255 -57 156 255 -74 156 255 -90 156 255 -106 156 255 -123 156 255 -139 156 255 -172 172 255 -180 172 255 -197 172 255 -205 172 255 -222 172 255 -230 172 255 -246 172 255 -255 172 255 -24 164 255 -41 164 255 -57 172 255 -74 164 255 -90 172 255 -106 172 255 -123 172 255 -139 172 255 -172 180 255 -189 189 255 -197 189 255 -213 189 255 -222 189 255 -230 189 255 -246 189 255 -255 189 255 -24 180 255 -41 180 255 -57 180 255 -74 180 255 -90 180 255 -106 180 255 -123 189 255 -139 189 255 -172 197 255 -189 197 255 -205 205 255 -213 205 255 -222 205 255 -238 205 255 -246 205 255 -255 205 255 -24 197 255 -41 197 255 -57 197 255 -74 197 255 -90 197 255 -106 197 255 -123 205 255 -139 197 255 -172 205 255 -189 213 255 -205 213 255 -222 222 255 -230 222 255 -238 222 255 -246 222 255 -255 222 255 -24 213 255 -41 213 255 -57 213 255 -74 213 255 -90 213 255 -106 213 255 -123 213 255 -139 213 255 -172 222 255 -189 222 255 -205 230 255 -222 230 255 -238 238 255 -246 238 255 -255 238 255 -255 238 255 -24 230 255 -41 230 255 -57 230 255 -74 230 255 -90 230 255 -106 230 255 -123 230 255 -139 230 255 -172 230 255 -189 238 255 -205 238 255 -222 238 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -24 246 255 -41 246 255 -57 246 255 -74 246 255 -90 246 255 -106 246 255 -123 246 255 -139 246 255 -172 246 255 -189 246 255 -205 246 255 -222 246 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -24 255 255 -41 255 255 -57 255 255 -74 255 255 -90 255 255 -106 255 255 -123 255 255 -139 255 255 -172 255 255 -189 255 255 -205 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/16.pal b/graphics/misc/sunny_day/16.pal deleted file mode 100644 index 6807ab175c..0000000000 --- a/graphics/misc/sunny_day/16.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 8 -24 8 8 -41 8 8 -57 8 8 -74 8 8 -90 8 8 -106 8 8 -148 0 0 -164 0 0 -180 0 0 -205 0 0 -222 0 0 -238 0 0 -255 0 0 -255 8 8 -255 32 32 -8 24 8 -24 24 8 -41 24 8 -57 24 8 -74 24 8 -90 24 8 -106 24 8 -148 16 0 -164 16 0 -180 16 0 -205 16 0 -222 16 0 -238 8 0 -255 16 0 -255 24 8 -255 49 32 -8 41 8 -24 41 8 -41 41 8 -57 41 8 -74 41 8 -90 41 8 -106 41 8 -148 41 0 -164 41 0 -180 41 0 -205 32 0 -222 32 0 -238 32 0 -255 32 0 -255 41 8 -255 57 32 -8 57 8 -24 57 8 -41 57 8 -57 57 8 -74 57 8 -90 57 8 -106 57 8 -148 57 0 -164 57 0 -180 57 0 -205 57 0 -222 57 0 -238 57 0 -255 49 0 -255 57 8 -255 74 32 -8 74 8 -24 74 8 -41 74 8 -57 74 8 -74 74 8 -90 74 8 -106 74 8 -148 82 0 -164 82 0 -180 82 0 -205 74 0 -222 74 0 -238 74 0 -255 74 0 -255 82 8 -255 90 32 -8 90 8 -24 90 8 -41 90 8 -57 90 8 -74 90 8 -90 90 8 -106 90 8 -148 106 0 -164 98 0 -180 98 0 -205 98 0 -222 98 0 -238 90 0 -255 90 0 -255 98 8 -255 106 32 -8 106 8 -24 106 8 -41 106 8 -57 106 8 -74 106 8 -90 106 8 -106 106 8 -148 123 0 -164 123 0 -180 115 0 -205 115 0 -222 115 0 -238 115 0 -255 115 0 -255 115 8 -255 123 32 -0 148 0 -24 148 0 -41 148 0 -65 148 0 -90 148 0 -106 148 0 -131 148 0 -148 148 0 -164 148 0 -180 139 0 -205 139 0 -222 131 0 -238 131 0 -255 131 0 -255 131 8 -255 139 32 -0 164 0 -24 164 0 -41 164 0 -65 164 0 -82 164 0 -106 164 0 -123 164 0 -148 164 0 -164 164 0 -180 164 0 -205 156 0 -222 156 0 -238 156 0 -255 148 0 -255 148 8 -255 148 32 -0 180 0 -16 180 0 -41 180 0 -57 180 0 -82 180 0 -106 180 0 -123 180 0 -139 180 0 -164 180 0 -180 180 0 -205 180 0 -222 172 0 -238 172 0 -255 172 0 -255 164 8 -255 164 32 -0 205 0 -16 205 0 -41 205 0 -57 205 0 -82 205 0 -98 205 0 -123 205 0 -139 205 0 -164 205 0 -180 205 0 -205 205 0 -222 197 0 -238 189 0 -255 189 0 -255 180 8 -255 180 32 -0 222 0 -16 222 0 -41 222 0 -57 222 0 -82 222 0 -98 222 0 -115 222 0 -139 222 0 -156 222 0 -180 222 0 -197 222 0 -222 222 0 -238 213 0 -255 213 0 -255 205 8 -255 197 32 -0 238 0 -16 238 0 -32 238 0 -57 238 0 -74 238 0 -98 238 0 -115 238 0 -139 238 0 -156 238 0 -172 238 0 -197 238 0 -213 238 0 -238 238 0 -255 230 0 -255 222 8 -255 213 32 -0 255 0 -16 255 0 -41 255 0 -57 255 0 -74 255 0 -98 255 0 -115 255 0 -139 255 0 -156 255 0 -172 255 0 -197 255 0 -213 255 0 -238 255 0 -255 255 0 -255 238 8 -255 222 32 -8 255 8 -24 255 8 -49 255 8 -65 255 8 -82 255 8 -98 255 8 -115 255 8 -131 255 8 -156 255 8 -172 255 8 -189 255 8 -205 255 8 -222 255 8 -238 255 8 -255 255 8 -255 238 32 -32 255 32 -49 255 32 -65 255 32 -82 255 32 -98 255 32 -106 255 32 -123 255 32 -139 255 32 -156 255 32 -172 255 32 -180 255 32 -197 255 32 -213 255 32 -230 255 32 -246 255 32 -255 255 32 diff --git a/graphics/misc/sunny_day/17.pal b/graphics/misc/sunny_day/17.pal deleted file mode 100644 index da38462097..0000000000 --- a/graphics/misc/sunny_day/17.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 24 -24 8 24 -41 8 24 -57 8 24 -74 8 24 -90 8 24 -106 8 24 -148 0 24 -164 0 24 -180 0 16 -205 0 16 -222 0 16 -238 0 16 -255 0 16 -255 8 24 -255 32 49 -8 24 24 -24 24 24 -41 24 24 -57 24 24 -74 24 24 -90 24 24 -131 24 24 -148 16 16 -164 16 16 -180 16 16 -197 16 16 -222 16 16 -238 16 16 -246 24 24 -255 41 41 -255 49 49 -8 41 24 -24 41 24 -41 41 24 -57 41 24 -74 41 24 -90 41 24 -131 41 24 -148 41 16 -164 41 16 -180 41 16 -197 32 16 -222 32 16 -238 32 16 -246 41 24 -255 57 41 -255 65 49 -8 57 24 -24 57 24 -41 57 24 -57 57 24 -74 57 24 -90 57 24 -131 57 24 -148 57 16 -164 57 16 -180 57 16 -197 57 16 -222 49 16 -238 49 16 -246 57 24 -255 74 41 -255 82 49 -8 74 24 -24 74 24 -41 74 24 -57 74 24 -74 74 24 -90 74 24 -131 82 24 -148 82 16 -164 82 16 -180 74 16 -197 74 16 -222 74 16 -238 74 16 -246 82 24 -255 90 41 -255 90 49 -8 90 24 -24 90 24 -41 90 24 -57 90 24 -74 90 24 -90 90 24 -131 106 24 -148 98 16 -164 98 16 -180 98 16 -197 98 16 -222 90 16 -238 90 16 -246 90 24 -255 106 41 -255 106 49 -8 106 24 -24 131 24 -41 131 24 -65 131 24 -82 131 24 -106 131 24 -131 131 24 -148 123 16 -164 123 16 -180 115 16 -197 115 16 -222 115 16 -238 115 16 -246 115 24 -255 115 41 -255 123 49 -0 148 16 -16 148 16 -41 148 16 -57 148 16 -82 148 16 -106 148 16 -123 148 16 -148 148 16 -164 139 16 -180 139 16 -197 139 16 -222 131 16 -238 131 16 -246 131 24 -255 139 41 -255 139 49 -0 164 16 -16 164 16 -41 164 16 -65 164 16 -82 164 16 -106 164 16 -123 164 16 -148 164 16 -164 164 16 -180 156 16 -197 156 16 -222 156 16 -238 148 16 -246 148 24 -255 156 41 -255 156 49 -0 180 16 -16 180 16 -41 180 16 -57 180 16 -82 180 16 -98 180 16 -123 180 16 -139 180 16 -164 180 16 -180 180 16 -197 180 16 -222 172 16 -238 172 16 -246 164 24 -255 164 41 -255 172 49 -0 205 16 -16 197 16 -32 197 16 -57 197 16 -74 197 16 -98 197 16 -123 197 16 -139 197 16 -164 197 16 -180 197 16 -197 197 16 -222 197 16 -238 189 16 -246 189 24 -255 189 41 -255 180 49 -0 222 16 -16 222 16 -32 222 16 -57 222 16 -74 222 16 -98 222 16 -115 222 16 -139 222 16 -156 222 16 -180 222 16 -197 222 16 -222 222 16 -238 213 16 -246 205 24 -255 197 41 -255 197 49 -0 238 8 -16 238 16 -32 238 16 -57 238 16 -74 238 16 -98 238 16 -115 238 16 -139 238 16 -156 238 16 -180 238 16 -197 238 16 -213 238 16 -238 238 16 -246 222 24 -255 213 41 -255 213 49 -0 255 16 -24 246 24 -41 246 24 -57 246 24 -82 246 24 -98 246 24 -115 246 24 -131 246 24 -148 246 24 -172 246 24 -189 246 24 -205 246 24 -222 246 24 -246 246 24 -255 238 41 -255 230 49 -8 255 24 -41 255 41 -57 255 41 -74 255 41 -90 255 41 -106 255 41 -123 255 41 -139 255 41 -156 255 41 -172 255 41 -189 255 41 -205 255 41 -222 255 41 -238 255 41 -255 255 41 -255 238 49 -32 255 49 -49 255 49 -65 255 49 -82 255 49 -98 255 49 -115 255 49 -131 255 49 -139 255 49 -156 255 49 -172 255 49 -189 255 49 -197 255 49 -213 255 49 -230 255 49 -246 255 49 -255 255 49 diff --git a/graphics/misc/sunny_day/18.pal b/graphics/misc/sunny_day/18.pal deleted file mode 100644 index 6e6b05b991..0000000000 --- a/graphics/misc/sunny_day/18.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 41 -24 8 41 -41 8 41 -57 8 41 -74 8 41 -90 8 41 -106 8 41 -148 0 41 -164 0 41 -180 0 41 -205 0 41 -222 0 41 -238 0 32 -255 0 41 -255 8 49 -255 32 65 -8 24 41 -24 24 41 -41 24 41 -57 24 41 -74 24 41 -90 24 41 -131 24 41 -148 16 41 -164 16 41 -180 16 41 -197 16 32 -222 16 32 -238 16 32 -246 24 41 -255 41 57 -255 49 65 -8 41 41 -24 41 41 -41 41 41 -57 41 41 -74 41 41 -106 41 41 -123 41 41 -148 41 41 -164 32 32 -180 32 32 -197 32 32 -213 32 32 -222 41 41 -238 57 57 -255 57 57 -255 65 65 -8 57 41 -24 57 41 -41 57 41 -57 57 41 -74 57 41 -106 65 41 -123 57 41 -148 57 41 -164 57 32 -180 57 32 -197 57 32 -213 49 32 -222 57 41 -238 74 57 -255 74 57 -255 82 65 -8 74 41 -24 74 41 -41 74 41 -57 74 41 -74 74 41 -106 82 41 -123 82 41 -148 82 41 -164 74 32 -180 74 32 -197 74 32 -213 74 32 -222 74 41 -238 90 57 -255 90 57 -255 98 65 -8 90 41 -24 90 41 -41 106 41 -65 106 41 -82 106 41 -106 106 41 -123 106 41 -148 98 41 -164 98 32 -180 98 32 -197 98 32 -213 90 32 -222 90 41 -238 106 57 -255 106 57 -255 106 65 -8 106 41 -24 131 41 -41 123 41 -57 123 41 -82 123 41 -106 123 41 -123 123 41 -148 123 41 -164 115 32 -180 115 32 -197 115 32 -213 115 32 -222 115 41 -238 123 57 -255 123 57 -255 123 65 -0 148 41 -16 148 41 -41 148 41 -57 148 41 -82 148 41 -98 148 41 -123 148 41 -148 148 41 -164 139 32 -180 139 32 -197 131 32 -213 131 32 -222 131 41 -238 139 57 -255 139 57 -255 139 65 -0 164 41 -16 164 41 -32 164 32 -57 164 32 -82 164 32 -98 164 32 -123 164 32 -139 164 32 -164 164 32 -180 156 32 -197 156 32 -213 148 32 -222 148 41 -238 156 57 -255 156 57 -255 156 65 -0 180 41 -16 180 41 -32 180 32 -57 180 32 -82 180 32 -98 180 32 -123 180 32 -139 180 32 -164 180 32 -180 180 32 -197 172 32 -213 172 32 -222 164 41 -238 164 57 -255 164 57 -255 172 65 -0 205 32 -16 197 32 -32 197 32 -57 197 32 -74 197 32 -98 197 32 -115 197 32 -139 197 32 -156 197 32 -180 197 32 -197 197 32 -213 197 32 -222 180 41 -238 189 57 -255 180 57 -255 180 65 -0 222 32 -16 222 32 -32 213 32 -57 213 32 -74 213 32 -98 213 32 -115 213 32 -139 213 32 -156 213 32 -172 213 32 -197 213 32 -213 213 32 -222 205 41 -238 197 57 -255 205 57 -255 197 65 -0 238 32 -16 238 32 -41 222 41 -57 222 41 -82 222 41 -98 222 41 -115 222 41 -131 222 41 -148 222 41 -172 222 41 -189 222 41 -205 222 41 -222 222 41 -238 222 57 -255 213 57 -255 213 65 -0 255 32 -24 246 41 -57 238 57 -74 238 57 -90 238 57 -106 238 57 -123 238 57 -139 238 57 -156 238 57 -172 238 57 -189 238 57 -205 238 57 -222 238 57 -238 238 57 -255 230 57 -255 230 65 -8 255 41 -41 255 57 -57 255 57 -74 255 57 -90 255 57 -106 255 57 -123 255 57 -139 255 57 -156 255 57 -172 255 57 -189 255 57 -205 255 57 -222 255 57 -238 255 57 -255 255 57 -255 246 65 -32 255 57 -49 255 65 -65 255 65 -82 255 65 -98 255 65 -115 255 65 -131 255 65 -139 255 65 -156 255 65 -172 255 65 -189 255 65 -205 255 65 -213 255 65 -230 255 65 -246 255 65 -255 255 65 diff --git a/graphics/misc/sunny_day/19.pal b/graphics/misc/sunny_day/19.pal deleted file mode 100644 index e03cc02534..0000000000 --- a/graphics/misc/sunny_day/19.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 57 -24 8 57 -41 8 57 -57 8 57 -74 8 57 -90 8 57 -106 8 57 -148 0 65 -164 0 65 -180 0 57 -205 0 57 -222 0 57 -238 0 57 -255 0 57 -255 8 65 -255 32 82 -8 24 57 -24 24 57 -41 24 57 -57 24 57 -74 24 57 -90 24 57 -131 24 65 -148 16 57 -164 16 65 -180 16 57 -197 16 57 -222 16 57 -238 16 57 -246 24 57 -255 41 74 -255 49 82 -8 41 57 -24 41 57 -41 41 57 -57 41 57 -74 41 57 -106 41 65 -123 41 57 -148 41 57 -164 32 57 -180 32 57 -197 32 57 -213 32 57 -222 41 57 -238 57 74 -255 57 74 -255 65 82 -8 57 57 -24 57 57 -41 57 57 -57 57 57 -82 65 65 -106 57 57 -123 57 57 -139 57 57 -156 57 57 -180 57 57 -197 49 49 -205 57 57 -222 74 74 -238 74 74 -255 74 74 -255 82 82 -8 74 57 -24 74 57 -41 74 57 -65 82 65 -82 82 65 -106 82 57 -123 82 57 -139 82 57 -156 74 57 -180 74 57 -197 74 49 -205 74 57 -222 90 74 -238 90 74 -255 90 74 -255 98 82 -8 90 57 -24 90 57 -41 106 65 -57 106 57 -82 106 57 -106 106 57 -123 98 57 -139 98 57 -156 98 57 -180 90 57 -197 90 49 -205 98 57 -222 106 74 -238 106 74 -255 106 74 -255 115 82 -8 106 57 -24 131 57 -41 123 57 -57 123 57 -82 123 57 -98 123 57 -123 123 57 -139 123 57 -156 115 57 -180 115 57 -197 115 49 -205 115 57 -222 123 74 -238 123 74 -255 123 74 -255 131 82 -0 148 57 -16 148 57 -41 148 57 -57 139 57 -82 139 57 -98 139 57 -123 139 57 -139 139 57 -156 139 57 -180 131 57 -197 131 49 -205 131 57 -222 139 74 -238 139 74 -255 139 74 -255 139 82 -0 164 57 -16 164 57 -32 164 57 -57 156 57 -74 156 57 -98 156 57 -115 156 57 -139 156 57 -156 156 57 -180 156 57 -197 156 49 -205 148 57 -222 156 74 -238 156 74 -255 156 74 -255 156 82 -0 180 57 -16 180 57 -32 180 57 -57 180 57 -74 180 57 -98 180 57 -115 180 57 -139 180 57 -156 180 57 -180 180 57 -197 172 49 -205 172 57 -222 172 74 -238 172 74 -255 172 74 -255 172 82 -0 205 57 -16 197 57 -32 197 57 -49 197 49 -74 197 49 -98 197 49 -115 197 49 -139 197 49 -156 197 49 -180 197 49 -197 197 49 -205 189 57 -222 189 74 -238 180 74 -255 180 74 -255 180 82 -0 222 57 -16 222 49 -32 213 49 -57 205 57 -82 205 57 -98 205 57 -115 205 57 -131 205 57 -156 205 57 -172 205 57 -189 205 57 -205 205 57 -222 205 74 -238 197 74 -255 205 74 -255 197 82 -0 238 57 -16 238 49 -41 222 57 -74 222 74 -90 222 74 -106 222 74 -123 222 74 -139 222 74 -156 222 74 -172 222 74 -189 222 74 -205 222 74 -222 222 74 -238 213 74 -255 213 74 -255 213 82 -0 255 49 -24 246 57 -57 238 74 -74 238 74 -90 238 74 -106 238 74 -123 238 74 -139 238 74 -156 238 74 -172 238 74 -189 238 74 -205 238 74 -222 238 74 -238 238 74 -255 230 74 -255 230 82 -8 255 57 -41 255 74 -57 255 74 -74 255 74 -90 255 74 -106 255 74 -123 255 74 -139 255 74 -156 255 74 -172 255 74 -189 255 74 -205 255 74 -222 255 74 -238 255 74 -255 255 74 -255 238 82 -32 255 74 -49 255 82 -65 255 82 -82 255 82 -98 255 82 -115 255 82 -131 255 82 -139 255 82 -156 255 82 -172 255 82 -189 255 82 -197 255 82 -213 255 82 -230 255 82 -246 255 82 -255 255 82 diff --git a/graphics/misc/sunny_day/2.pal b/graphics/misc/sunny_day/2.pal deleted file mode 100644 index 7a80757999..0000000000 --- a/graphics/misc/sunny_day/2.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 41 -24 8 41 -41 8 41 -57 8 41 -74 8 41 -90 8 41 -106 8 41 -139 0 41 -156 0 41 -172 0 41 -189 0 41 -205 0 32 -222 0 32 -238 0 41 -255 0 41 -255 24 57 -8 24 41 -24 24 41 -41 24 41 -57 24 41 -74 24 41 -90 24 41 -115 16 41 -131 16 41 -156 16 41 -172 16 41 -189 16 32 -205 16 32 -222 16 32 -238 16 32 -246 32 49 -255 41 57 -8 41 41 -24 41 41 -41 41 41 -57 41 41 -74 41 41 -98 41 41 -115 41 41 -131 41 41 -148 32 32 -172 32 32 -189 32 32 -205 32 32 -222 32 32 -230 49 49 -246 49 49 -255 57 57 -8 57 41 -24 57 41 -41 57 41 -57 57 41 -74 57 41 -98 57 41 -115 57 41 -131 57 41 -148 57 32 -172 57 32 -189 49 32 -205 49 32 -222 49 32 -230 65 49 -246 65 49 -255 74 57 -8 74 41 -24 74 41 -41 74 41 -57 74 41 -74 74 41 -98 74 41 -115 74 41 -131 74 41 -148 74 32 -172 74 32 -189 74 32 -205 74 32 -222 65 32 -230 82 49 -246 82 49 -255 90 57 -8 90 41 -24 90 41 -41 98 41 -57 98 41 -82 98 41 -98 98 41 -115 98 41 -131 90 41 -148 90 32 -172 90 32 -189 90 32 -205 90 32 -222 90 32 -230 98 49 -246 98 49 -255 98 57 -8 106 41 -16 115 41 -41 115 41 -57 115 41 -74 115 41 -98 115 41 -115 115 41 -131 115 41 -148 115 32 -172 115 32 -189 115 32 -205 106 32 -222 106 32 -230 115 49 -246 115 49 -255 115 57 -0 139 41 -16 131 41 -41 131 41 -57 131 41 -74 131 41 -98 131 41 -115 131 41 -131 131 41 -148 131 32 -172 131 32 -189 131 32 -205 131 32 -222 131 32 -230 131 49 -246 131 49 -255 131 57 -0 156 41 -16 156 41 -32 148 32 -57 148 32 -74 148 32 -90 148 32 -115 148 32 -131 148 32 -148 148 32 -172 148 32 -189 148 32 -205 148 32 -222 139 32 -230 148 49 -246 148 49 -255 148 57 -0 172 32 -16 172 32 -32 172 32 -57 172 32 -74 172 32 -90 172 32 -115 172 32 -131 172 32 -148 172 32 -172 172 32 -189 164 32 -205 164 32 -222 164 32 -230 164 49 -246 164 49 -255 164 57 -0 189 32 -16 189 32 -32 189 32 -57 189 32 -74 189 32 -90 189 32 -115 189 32 -131 189 32 -148 189 32 -172 189 32 -189 189 32 -205 180 32 -222 180 32 -230 180 49 -246 180 49 -255 180 57 -0 205 32 -16 205 32 -32 205 32 -57 205 32 -74 205 32 -90 205 32 -115 205 32 -131 205 32 -148 205 32 -164 205 32 -189 205 32 -205 205 32 -222 197 32 -230 197 49 -246 197 49 -255 197 57 -0 222 32 -16 222 32 -32 222 32 -57 222 32 -74 222 32 -90 222 32 -106 222 32 -131 222 32 -148 222 32 -164 222 32 -180 222 32 -205 222 32 -222 222 32 -230 213 49 -246 213 49 -255 205 57 -0 238 32 -16 238 32 -49 230 49 -65 230 49 -82 230 49 -106 230 49 -115 230 49 -139 230 49 -148 230 49 -164 230 49 -180 230 49 -197 230 49 -213 230 49 -230 230 49 -246 230 49 -255 222 57 -0 255 32 -32 246 49 -49 246 49 -65 246 49 -82 246 49 -98 246 49 -115 246 49 -131 246 49 -148 246 49 -164 246 49 -180 246 49 -197 246 49 -213 246 49 -230 246 49 -246 246 49 -255 238 57 -24 255 49 -41 255 57 -57 255 57 -74 255 57 -90 255 57 -106 255 57 -123 255 57 -131 255 57 -156 255 57 -172 255 57 -180 255 57 -197 255 57 -213 255 57 -230 255 57 -246 255 57 -255 255 57 diff --git a/graphics/misc/sunny_day/20.pal b/graphics/misc/sunny_day/20.pal deleted file mode 100644 index bf140d072d..0000000000 --- a/graphics/misc/sunny_day/20.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 74 -24 8 74 -41 8 74 -57 8 74 -74 8 74 -90 8 74 -106 8 74 -148 0 90 -164 0 82 -180 0 82 -205 0 82 -222 0 82 -238 0 74 -255 0 74 -255 8 82 -255 32 98 -8 24 74 -24 24 74 -41 24 74 -57 24 74 -74 24 74 -90 24 74 -131 24 82 -148 16 82 -164 16 82 -180 16 82 -197 16 74 -222 16 74 -238 16 74 -246 24 82 -255 41 90 -255 49 98 -8 41 74 -24 41 74 -41 41 74 -57 41 74 -74 41 74 -106 41 82 -123 41 82 -148 41 82 -164 32 82 -180 32 82 -197 32 74 -213 32 74 -222 41 82 -238 57 90 -255 57 90 -255 65 98 -8 57 74 -24 57 74 -41 57 74 -65 65 82 -82 65 82 -106 57 82 -123 57 82 -139 57 82 -156 57 74 -180 57 74 -197 49 74 -205 57 82 -222 74 90 -238 74 90 -255 74 90 -255 82 98 -8 74 74 -24 74 74 -41 74 74 -65 82 82 -82 82 82 -98 82 82 -123 82 82 -139 74 74 -156 74 74 -172 74 74 -189 82 82 -205 90 90 -222 90 90 -238 90 90 -255 90 90 -255 106 106 -8 90 74 -24 90 74 -41 106 82 -57 106 82 -82 98 82 -98 98 82 -123 98 82 -139 98 74 -156 98 74 -172 90 74 -189 98 82 -205 106 90 -222 106 90 -238 106 90 -255 106 90 -255 115 106 -8 106 74 -24 131 82 -41 123 82 -57 123 82 -82 123 82 -98 123 82 -123 123 82 -139 115 74 -156 115 74 -172 115 74 -189 115 82 -205 123 90 -222 123 90 -238 123 90 -255 123 90 -255 131 106 -0 148 82 -16 148 82 -41 148 82 -57 139 82 -74 139 74 -98 139 74 -115 139 74 -139 139 74 -156 139 74 -172 131 74 -189 131 82 -205 139 90 -222 139 90 -238 139 90 -255 139 90 -255 148 106 -0 164 82 -16 164 82 -32 164 74 -57 156 74 -74 156 74 -98 156 74 -115 156 74 -139 156 74 -156 156 74 -172 156 74 -189 148 82 -205 156 90 -222 156 90 -238 156 90 -255 156 90 -255 156 106 -0 180 82 -16 180 74 -32 180 74 -57 180 74 -74 172 74 -90 172 74 -115 172 74 -131 172 74 -156 172 74 -172 172 74 -189 164 82 -205 172 90 -222 172 90 -238 172 90 -255 172 90 -255 172 106 -0 205 74 -16 197 74 -32 197 74 -49 197 74 -82 189 82 -98 189 82 -115 189 82 -131 189 82 -148 189 82 -172 189 82 -189 189 82 -205 189 90 -222 189 90 -238 189 90 -255 189 90 -255 189 106 -0 222 74 -16 222 74 -32 213 74 -57 205 74 -90 205 90 -106 205 90 -123 205 90 -139 205 90 -156 205 90 -172 205 90 -189 205 90 -205 205 90 -222 205 90 -238 205 90 -255 197 90 -255 197 106 -0 238 74 -16 238 74 -41 222 74 -74 222 90 -90 222 90 -106 222 90 -123 222 90 -139 222 90 -156 222 90 -172 222 90 -189 222 90 -205 222 90 -222 222 90 -238 222 90 -255 213 90 -255 213 106 -0 255 74 -24 246 82 -57 238 90 -74 238 90 -90 238 90 -106 238 90 -123 238 90 -139 238 90 -156 238 90 -172 238 90 -189 238 90 -205 238 90 -222 238 90 -238 238 90 -255 230 90 -255 230 106 -8 255 82 -41 255 90 -57 255 90 -74 255 90 -90 255 90 -106 255 90 -123 255 90 -139 255 90 -156 255 90 -172 255 90 -189 255 90 -205 255 90 -222 255 90 -238 255 90 -255 255 90 -255 246 106 -32 255 90 -49 255 90 -65 255 98 -82 255 98 -106 255 106 -115 255 106 -131 255 106 -148 255 106 -156 255 106 -172 255 106 -189 255 106 -205 255 106 -213 255 106 -230 255 106 -246 255 106 -255 255 106 diff --git a/graphics/misc/sunny_day/21.pal b/graphics/misc/sunny_day/21.pal deleted file mode 100644 index 9a48b9028c..0000000000 --- a/graphics/misc/sunny_day/21.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 90 -24 8 90 -41 8 90 -57 8 90 -74 8 90 -90 8 90 -106 8 90 -148 0 106 -164 0 106 -180 0 106 -205 0 98 -222 0 98 -238 0 98 -255 0 98 -255 8 98 -255 32 106 -8 24 90 -24 24 90 -41 24 90 -57 24 90 -74 24 90 -90 24 90 -131 24 106 -148 16 106 -164 16 106 -180 16 98 -197 16 98 -222 16 98 -238 16 98 -246 24 98 -255 41 106 -255 49 115 -8 41 90 -24 41 90 -41 41 106 -65 41 106 -82 41 106 -106 41 106 -123 41 106 -148 41 98 -164 32 98 -180 32 98 -197 32 98 -213 32 98 -222 41 98 -238 57 106 -255 57 106 -255 65 115 -8 57 90 -24 57 90 -41 65 106 -57 57 106 -82 57 106 -106 57 106 -123 57 98 -139 57 98 -156 57 98 -180 57 98 -197 49 98 -205 57 98 -222 74 106 -238 74 106 -255 74 106 -255 82 115 -8 74 90 -24 74 90 -41 82 106 -57 82 106 -82 82 98 -98 82 98 -123 82 98 -139 74 98 -156 74 98 -172 74 90 -189 82 98 -205 90 106 -222 90 106 -238 90 106 -255 90 106 -255 106 115 -8 90 90 -24 90 90 -41 106 106 -57 106 106 -82 98 98 -98 98 98 -123 98 98 -139 98 98 -156 98 98 -172 98 98 -189 106 106 -205 106 106 -222 106 106 -238 106 106 -255 115 115 -255 123 123 -8 106 90 -24 131 106 -41 123 106 -57 123 98 -82 123 98 -98 123 98 -123 123 98 -139 115 98 -156 115 98 -172 115 98 -189 123 106 -205 123 106 -222 123 106 -238 123 106 -255 123 115 -255 131 123 -0 148 106 -16 148 98 -41 148 98 -57 139 98 -74 139 98 -98 139 98 -115 139 98 -139 139 98 -156 131 98 -172 131 98 -189 139 106 -205 139 106 -222 139 106 -238 139 106 -255 139 115 -255 148 123 -0 164 98 -16 164 98 -32 164 98 -57 156 98 -74 156 98 -98 156 98 -115 156 98 -131 156 98 -156 156 98 -172 156 98 -189 156 106 -205 156 106 -222 156 106 -238 156 106 -255 156 115 -255 156 123 -0 180 98 -16 180 98 -32 180 98 -57 180 90 -74 172 90 -98 172 98 -115 172 98 -131 172 98 -156 172 98 -172 172 98 -189 172 106 -205 172 106 -222 172 106 -238 172 106 -255 172 115 -255 172 123 -0 205 98 -16 197 98 -32 197 98 -49 197 90 -82 189 98 -106 189 106 -123 189 106 -139 189 106 -156 189 106 -172 189 106 -189 189 106 -205 189 106 -222 189 106 -238 189 106 -255 189 115 -255 189 123 -0 222 98 -16 222 90 -32 213 90 -57 205 98 -90 205 106 -106 205 106 -123 205 106 -139 205 106 -156 205 106 -172 205 106 -189 205 106 -205 205 106 -222 205 106 -238 205 106 -255 205 115 -255 197 123 -0 238 90 -16 238 90 -41 222 90 -74 222 106 -90 222 106 -106 222 106 -123 222 106 -139 222 106 -156 222 106 -172 222 106 -189 222 106 -205 222 106 -222 222 106 -238 222 106 -255 222 115 -255 213 123 -0 255 90 -24 246 90 -57 238 106 -74 238 106 -90 238 106 -106 238 106 -123 238 106 -139 238 106 -156 238 106 -172 238 106 -189 238 106 -205 238 106 -222 238 106 -238 238 106 -255 238 115 -255 230 123 -8 255 98 -41 255 106 -57 255 106 -74 255 106 -90 255 106 -115 255 115 -123 255 115 -139 255 115 -156 255 115 -172 255 115 -189 255 115 -205 255 115 -222 255 115 -238 255 115 -255 255 115 -255 246 123 -32 255 106 -49 255 106 -65 255 106 -82 255 115 -106 255 115 -123 255 123 -131 255 123 -148 255 123 -164 255 123 -172 255 123 -189 255 123 -205 255 123 -213 255 123 -230 255 123 -246 255 123 -255 255 123 diff --git a/graphics/misc/sunny_day/22.pal b/graphics/misc/sunny_day/22.pal deleted file mode 100644 index 25d9bc5132..0000000000 --- a/graphics/misc/sunny_day/22.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 106 -24 8 106 -41 8 106 -57 8 106 -74 8 106 -90 8 106 -106 8 106 -148 0 131 -164 0 123 -180 0 123 -205 0 123 -222 0 115 -238 0 115 -255 0 115 -255 8 115 -255 32 123 -8 24 106 -24 24 131 -41 24 131 -57 24 131 -82 24 131 -106 24 131 -131 24 131 -148 16 123 -164 16 123 -180 16 123 -197 16 123 -222 16 115 -238 16 115 -246 24 115 -255 41 123 -255 49 131 -8 41 106 -24 41 131 -41 41 123 -57 41 123 -82 41 123 -106 41 123 -123 41 123 -148 41 123 -164 32 123 -180 32 123 -197 32 115 -213 32 115 -222 41 115 -238 57 123 -255 57 123 -255 65 131 -8 57 106 -24 65 131 -41 57 123 -57 57 123 -82 57 123 -98 57 123 -123 57 123 -139 57 123 -156 57 115 -180 57 115 -197 49 115 -205 57 115 -222 74 123 -238 74 123 -255 74 123 -255 82 131 -8 74 106 -24 82 131 -41 82 123 -57 82 123 -82 82 123 -98 82 123 -123 82 123 -139 74 115 -156 74 115 -172 74 115 -189 82 115 -205 90 123 -222 90 123 -238 90 123 -255 90 123 -255 106 131 -8 90 106 -24 106 131 -41 106 123 -57 98 123 -82 98 123 -98 98 123 -123 98 123 -139 98 115 -156 98 115 -172 98 115 -189 106 123 -205 106 123 -222 106 123 -238 106 123 -255 115 123 -255 123 131 -8 106 106 -24 131 131 -41 123 123 -57 123 123 -82 123 123 -98 123 123 -115 115 115 -139 115 115 -156 115 115 -172 123 123 -189 123 123 -205 123 123 -222 123 123 -238 123 123 -246 131 131 -255 139 139 -0 148 123 -16 148 123 -41 148 123 -57 139 123 -74 139 115 -98 139 115 -115 139 115 -139 139 115 -156 131 115 -172 139 123 -189 139 123 -205 139 123 -222 139 123 -238 139 123 -246 139 131 -255 148 139 -0 164 123 -16 164 123 -32 164 115 -57 156 115 -74 156 115 -98 156 115 -115 156 115 -131 156 115 -156 156 115 -172 156 123 -189 156 123 -205 156 123 -222 156 123 -238 156 123 -246 156 131 -255 164 139 -0 180 115 -16 180 115 -32 180 115 -57 180 115 -74 172 115 -98 172 115 -123 172 123 -139 172 123 -156 172 123 -172 172 123 -189 172 123 -205 172 123 -222 172 123 -238 172 123 -246 172 131 -255 172 139 -0 205 115 -16 197 115 -32 197 115 -49 197 115 -82 189 115 -106 189 123 -123 189 123 -139 189 123 -156 189 123 -172 189 123 -189 189 123 -205 189 123 -222 189 123 -238 189 123 -246 189 131 -255 189 139 -0 222 115 -16 222 115 -32 213 115 -57 205 115 -90 205 123 -106 205 123 -123 205 123 -139 205 123 -156 205 123 -172 205 123 -189 205 123 -205 205 123 -222 205 123 -238 205 123 -246 205 131 -255 205 139 -0 238 115 -16 238 115 -41 222 115 -74 222 123 -90 222 123 -106 222 123 -123 222 123 -139 222 123 -156 222 123 -172 222 123 -189 222 123 -205 222 123 -222 222 123 -238 222 123 -246 222 131 -255 213 139 -0 255 115 -24 246 115 -57 238 123 -74 238 123 -90 238 123 -106 238 123 -123 238 123 -139 238 123 -156 238 123 -172 238 123 -189 238 123 -205 238 123 -222 238 123 -238 238 123 -246 230 131 -255 230 139 -8 255 115 -41 255 115 -57 255 123 -74 255 123 -90 255 123 -115 255 123 -131 246 131 -148 246 131 -156 246 131 -172 246 131 -189 246 131 -205 246 131 -222 246 131 -238 246 131 -246 246 131 -255 246 139 -32 255 123 -49 255 123 -65 255 123 -82 255 131 -106 255 131 -123 255 131 -139 255 139 -148 255 139 -164 255 139 -180 255 139 -189 255 139 -205 255 139 -222 255 139 -230 255 139 -246 255 139 -255 255 139 diff --git a/graphics/misc/sunny_day/23.pal b/graphics/misc/sunny_day/23.pal deleted file mode 100644 index 478a765f6d..0000000000 --- a/graphics/misc/sunny_day/23.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 148 -16 0 148 -41 0 148 -57 0 148 -82 0 148 -106 0 148 -123 0 148 -148 0 148 -164 0 148 -180 0 139 -205 0 139 -222 0 139 -238 0 139 -255 0 139 -255 8 131 -255 32 139 -0 24 148 -16 16 148 -41 16 148 -57 16 148 -82 16 148 -98 16 148 -123 16 148 -148 16 148 -164 16 148 -180 16 139 -197 16 139 -222 16 139 -238 16 139 -246 24 131 -255 41 139 -255 49 139 -0 41 148 -16 41 148 -41 41 148 -57 41 148 -82 41 148 -98 41 148 -123 41 148 -148 41 148 -164 32 139 -180 32 139 -197 32 139 -213 32 139 -222 41 131 -238 57 139 -255 57 139 -255 65 139 -0 65 148 -16 57 148 -41 57 148 -57 57 139 -82 57 139 -98 57 139 -123 57 139 -139 57 139 -156 57 139 -180 57 139 -197 49 139 -205 57 131 -222 74 139 -238 74 139 -255 74 139 -255 82 139 -0 90 148 -16 82 148 -41 82 148 -57 82 139 -74 74 139 -98 74 139 -115 74 139 -139 74 139 -156 74 139 -172 74 131 -189 82 131 -205 90 139 -222 90 139 -238 90 139 -255 90 139 -255 106 148 -0 106 148 -16 106 148 -41 98 148 -57 98 139 -74 98 139 -98 98 139 -115 98 139 -139 98 139 -156 98 131 -172 98 131 -189 106 139 -205 106 139 -222 106 139 -238 106 139 -255 115 139 -255 123 148 -0 131 148 -16 123 148 -41 123 148 -57 123 139 -74 115 139 -98 115 139 -115 115 139 -139 115 139 -156 115 131 -172 123 139 -189 123 139 -205 123 139 -222 123 139 -238 123 139 -246 131 148 -255 139 148 -0 148 148 -16 148 148 -41 148 148 -57 139 139 -74 139 139 -98 139 139 -115 139 139 -139 131 131 -156 139 139 -172 139 139 -189 139 139 -205 139 139 -222 139 139 -238 139 139 -246 148 148 -255 156 156 -0 164 148 -16 164 139 -32 164 139 -57 156 139 -74 156 139 -98 156 131 -115 156 131 -139 156 139 -156 156 139 -172 156 139 -189 156 139 -205 156 139 -222 156 139 -238 156 139 -246 156 148 -255 164 156 -0 180 139 -16 180 139 -32 180 139 -57 180 131 -74 172 131 -98 172 131 -123 172 139 -139 172 139 -156 172 139 -172 172 139 -189 172 139 -205 172 139 -222 172 139 -238 172 139 -246 172 148 -255 180 156 -0 205 139 -16 197 139 -32 197 131 -49 197 131 -82 189 131 -106 189 139 -123 189 139 -139 189 139 -156 189 139 -172 189 139 -189 189 139 -205 189 139 -222 189 139 -238 189 139 -246 189 148 -255 189 156 -0 222 131 -16 222 131 -32 213 131 -57 205 131 -90 205 139 -106 205 139 -123 205 139 -139 205 139 -156 205 139 -172 205 139 -189 205 139 -205 205 139 -222 205 139 -238 205 139 -246 205 148 -255 205 156 -0 238 131 -16 238 131 -41 222 131 -74 222 139 -90 222 139 -106 222 139 -123 222 139 -139 222 139 -156 222 139 -172 222 139 -189 222 139 -205 222 139 -222 222 139 -238 222 139 -246 222 148 -255 222 156 -0 255 131 -24 246 131 -57 238 139 -74 238 139 -90 238 139 -106 238 139 -123 238 139 -139 238 139 -156 238 139 -172 238 139 -189 238 139 -205 238 139 -222 238 139 -238 238 139 -246 238 148 -255 230 156 -8 255 131 -41 255 139 -57 255 139 -74 255 139 -90 255 139 -115 255 139 -131 246 139 -148 246 148 -164 246 148 -180 246 148 -189 246 148 -205 246 148 -222 246 148 -238 246 148 -246 246 148 -255 246 156 -32 255 139 -49 255 139 -65 255 139 -82 255 139 -106 255 148 -123 255 148 -139 255 148 -156 255 156 -164 255 156 -180 255 156 -197 255 156 -205 255 156 -222 255 156 -230 255 156 -246 255 156 -255 255 156 diff --git a/graphics/misc/sunny_day/24.pal b/graphics/misc/sunny_day/24.pal deleted file mode 100644 index 5da491fd26..0000000000 --- a/graphics/misc/sunny_day/24.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 164 -16 0 164 -41 0 164 -57 0 164 -82 0 164 -98 0 164 -123 0 164 -148 0 164 -164 0 164 -180 0 164 -205 0 164 -222 0 156 -238 0 156 -255 0 156 -255 8 156 -255 32 156 -0 24 164 -16 16 164 -41 16 164 -57 16 164 -82 16 164 -98 16 164 -123 16 164 -139 16 164 -164 16 164 -180 16 164 -197 16 164 -222 16 156 -238 16 156 -246 24 148 -255 41 156 -255 49 156 -0 41 164 -16 41 164 -32 32 164 -57 32 164 -74 32 164 -98 32 164 -115 32 164 -139 32 164 -164 32 164 -180 32 164 -197 32 156 -213 32 156 -222 41 148 -238 57 156 -255 57 156 -255 65 156 -0 65 164 -16 65 164 -32 57 164 -57 57 156 -74 57 156 -98 57 156 -115 57 156 -139 57 156 -156 57 156 -180 57 156 -197 49 156 -205 57 156 -222 74 156 -238 74 156 -255 74 156 -255 82 156 -0 82 164 -16 82 164 -32 82 164 -57 74 156 -74 74 156 -98 74 156 -115 74 156 -139 74 156 -156 74 156 -172 74 156 -189 82 148 -205 90 156 -222 90 156 -238 90 156 -255 90 156 -255 106 156 -0 106 164 -16 106 164 -32 98 164 -57 98 156 -74 98 156 -98 98 156 -115 98 156 -131 98 156 -156 98 156 -172 98 156 -189 106 156 -205 106 156 -222 106 156 -238 106 156 -255 115 156 -255 123 164 -0 123 164 -16 123 164 -32 123 164 -57 115 156 -74 115 156 -98 115 156 -115 115 156 -131 115 156 -156 115 156 -172 123 156 -189 123 156 -205 123 156 -222 123 156 -238 123 156 -246 131 156 -255 139 164 -0 148 164 -16 148 164 -32 139 164 -57 139 156 -74 139 156 -98 131 156 -115 131 156 -139 139 156 -156 139 156 -172 139 156 -189 139 156 -205 139 156 -222 139 156 -238 139 156 -246 148 164 -255 156 164 -0 164 164 -16 164 164 -32 164 164 -57 156 156 -74 156 156 -98 156 156 -115 156 156 -139 156 156 -156 156 156 -172 156 156 -189 156 156 -205 156 156 -222 156 156 -238 164 164 -246 164 164 -255 180 180 -0 180 164 -16 180 156 -32 180 156 -57 180 156 -74 172 156 -98 172 156 -123 172 156 -139 172 156 -156 172 156 -172 172 156 -189 172 156 -205 172 156 -222 172 156 -238 172 164 -246 172 164 -255 189 180 -0 205 156 -16 197 156 -32 197 156 -49 197 156 -82 189 148 -106 189 156 -123 189 156 -139 189 156 -156 189 156 -172 189 156 -189 189 156 -205 189 156 -222 189 156 -238 189 164 -246 189 164 -255 205 180 -0 222 156 -16 222 156 -32 213 148 -57 205 148 -90 205 156 -106 205 156 -123 205 156 -139 205 156 -156 205 156 -172 205 156 -189 205 156 -205 205 156 -222 205 156 -238 205 164 -246 205 164 -255 213 180 -0 238 156 -16 238 148 -41 222 148 -74 222 156 -90 222 156 -106 222 156 -123 222 156 -139 222 156 -156 222 156 -172 222 156 -189 222 156 -205 222 156 -222 222 156 -238 222 164 -246 222 164 -255 222 180 -0 255 148 -24 246 148 -57 238 156 -74 238 156 -90 238 156 -106 238 156 -123 238 156 -139 238 156 -164 238 164 -172 238 164 -189 238 164 -205 238 164 -222 238 164 -238 238 164 -246 230 164 -255 238 180 -8 255 148 -41 255 156 -57 255 156 -74 255 156 -90 255 156 -115 255 156 -131 246 156 -148 246 156 -164 246 164 -180 246 164 -189 246 164 -205 246 164 -222 246 164 -238 246 164 -246 246 164 -255 246 180 -32 255 148 -49 255 156 -65 255 156 -82 255 156 -106 255 156 -123 255 156 -139 255 164 -156 255 164 -180 255 180 -189 255 180 -205 255 180 -213 255 180 -230 255 180 -238 255 180 -246 255 180 -255 255 180 diff --git a/graphics/misc/sunny_day/25.pal b/graphics/misc/sunny_day/25.pal deleted file mode 100644 index dce1c86a15..0000000000 --- a/graphics/misc/sunny_day/25.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 180 -16 0 180 -41 0 180 -57 0 180 -82 0 180 -98 0 180 -115 0 180 -139 0 180 -164 0 180 -180 0 180 -205 0 180 -222 0 180 -238 0 172 -255 0 172 -255 8 172 -255 32 172 -0 16 180 -16 16 180 -41 16 180 -57 16 180 -74 16 180 -98 16 180 -115 16 180 -139 16 180 -156 16 180 -180 16 180 -197 16 180 -222 16 180 -238 16 180 -246 24 172 -255 41 172 -255 49 172 -0 41 180 -16 41 180 -32 32 180 -57 32 180 -74 32 180 -98 32 180 -115 32 180 -139 32 180 -156 32 180 -180 32 180 -197 32 180 -213 32 172 -222 41 172 -238 57 172 -255 57 172 -255 65 172 -0 57 180 -16 57 180 -32 57 180 -57 57 180 -74 57 180 -90 57 180 -115 57 180 -131 57 180 -156 57 180 -180 57 180 -197 49 180 -205 57 172 -222 74 172 -238 74 172 -255 74 172 -255 82 172 -0 82 180 -16 82 180 -32 82 180 -57 74 180 -74 74 172 -90 74 172 -115 74 172 -131 74 172 -156 74 172 -172 74 172 -189 82 172 -205 90 172 -222 90 172 -238 90 172 -255 90 172 -255 106 172 -0 106 180 -16 98 180 -32 98 180 -57 98 180 -74 90 172 -98 98 172 -115 98 172 -131 98 172 -156 98 172 -172 98 172 -189 106 172 -205 106 172 -222 106 172 -238 106 172 -255 115 172 -255 123 172 -0 123 180 -16 123 180 -32 123 180 -57 115 180 -74 115 172 -98 115 172 -123 123 172 -139 123 172 -156 123 172 -172 123 172 -189 123 172 -205 123 172 -222 123 172 -238 123 172 -246 131 172 -255 139 180 -0 139 180 -16 139 180 -32 139 180 -57 139 180 -74 131 172 -98 131 172 -123 139 172 -139 139 172 -156 139 172 -172 139 172 -189 139 172 -205 139 172 -222 139 172 -238 139 172 -246 148 180 -255 156 180 -0 164 180 -16 164 180 -32 164 180 -57 156 180 -74 156 172 -98 156 172 -123 156 172 -139 156 172 -156 156 172 -172 156 172 -189 156 172 -205 156 172 -222 156 172 -238 164 172 -246 164 180 -255 180 189 -0 180 180 -16 180 180 -32 180 180 -57 180 180 -74 172 172 -98 172 172 -123 172 172 -139 172 172 -156 172 172 -172 172 172 -189 172 172 -205 172 172 -222 172 172 -238 180 180 -246 189 189 -255 197 197 -0 205 180 -16 197 180 -32 197 172 -49 197 172 -82 189 164 -106 189 172 -123 189 172 -139 189 172 -156 189 172 -172 189 172 -189 189 172 -205 189 172 -222 189 172 -238 189 180 -246 197 189 -255 205 197 -0 222 172 -16 222 172 -32 213 172 -57 205 172 -90 205 172 -106 205 172 -123 205 172 -139 205 172 -156 205 172 -172 205 172 -189 205 172 -205 205 172 -222 205 172 -238 205 180 -246 213 189 -255 213 197 -0 238 172 -16 238 172 -41 222 164 -74 222 172 -90 222 172 -106 222 172 -123 222 172 -139 222 172 -156 222 172 -172 222 172 -189 222 172 -205 222 172 -222 222 172 -238 222 180 -246 222 189 -255 230 197 -0 255 172 -24 246 164 -57 238 164 -74 238 172 -90 238 172 -106 238 172 -123 238 172 -139 238 172 -164 238 172 -180 238 180 -189 238 180 -205 238 180 -222 238 180 -238 238 180 -246 238 189 -255 238 197 -8 255 164 -41 255 164 -57 255 164 -74 255 172 -90 255 172 -115 255 172 -131 246 172 -148 246 172 -164 246 172 -189 246 189 -205 246 189 -213 246 189 -230 246 189 -238 246 189 -246 246 189 -255 246 197 -32 255 164 -49 255 172 -65 255 172 -82 255 172 -106 255 172 -123 255 172 -139 255 172 -156 255 180 -180 255 189 -197 255 197 -205 255 197 -222 255 197 -230 255 197 -238 255 197 -246 255 197 -255 255 197 diff --git a/graphics/misc/sunny_day/26.pal b/graphics/misc/sunny_day/26.pal deleted file mode 100644 index 2ddab2f0ba..0000000000 --- a/graphics/misc/sunny_day/26.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 205 -16 0 205 -32 0 205 -57 0 205 -74 0 205 -98 0 205 -115 0 205 -139 0 205 -156 0 205 -180 0 205 -205 0 205 -222 0 197 -238 0 197 -255 0 197 -255 8 189 -255 32 180 -0 16 205 -16 16 197 -32 16 197 -57 16 197 -74 16 197 -98 16 197 -115 16 197 -139 16 197 -156 16 197 -180 16 197 -197 16 197 -222 16 197 -238 16 197 -246 24 189 -255 41 189 -255 49 189 -0 41 205 -16 32 197 -32 32 197 -57 32 197 -74 32 197 -98 32 197 -115 32 197 -131 32 197 -156 32 197 -172 32 197 -197 32 197 -213 32 197 -222 41 189 -238 57 189 -255 57 189 -255 65 189 -0 57 205 -16 57 197 -32 57 197 -49 49 197 -74 49 197 -90 49 197 -115 49 197 -131 49 197 -156 49 197 -172 49 197 -197 49 197 -205 57 189 -222 74 189 -238 74 189 -255 74 189 -255 82 189 -0 82 205 -16 74 197 -32 74 197 -49 74 197 -82 82 189 -98 82 189 -115 82 189 -131 82 189 -148 82 189 -164 82 189 -189 82 189 -205 90 189 -222 90 189 -238 90 189 -255 90 189 -255 106 189 -0 98 205 -16 98 197 -32 98 197 -49 98 197 -82 98 189 -106 106 189 -123 106 189 -139 106 189 -156 106 189 -172 106 189 -189 106 189 -205 106 189 -222 106 189 -238 106 189 -255 115 189 -255 123 189 -0 123 205 -16 123 197 -32 115 197 -49 115 197 -82 115 189 -106 123 189 -123 123 189 -139 123 189 -156 123 189 -172 123 189 -189 123 189 -205 123 189 -222 123 189 -238 123 189 -246 131 189 -255 139 189 -0 139 205 -16 139 197 -32 139 197 -49 139 197 -82 131 189 -106 139 189 -123 139 189 -139 139 189 -156 139 189 -172 139 189 -189 139 189 -205 139 189 -222 139 189 -238 139 189 -246 148 189 -255 156 197 -0 164 205 -16 164 197 -32 156 197 -49 156 197 -82 148 189 -106 156 189 -123 156 189 -139 156 189 -156 156 189 -172 156 189 -189 156 189 -205 156 189 -222 156 189 -238 164 189 -246 164 189 -255 180 205 -0 180 205 -16 180 197 -32 180 197 -49 180 197 -82 172 189 -106 172 189 -123 172 189 -139 172 189 -156 172 189 -172 172 189 -189 172 189 -205 172 189 -222 172 189 -238 180 189 -246 189 205 -255 197 205 -0 205 205 -16 197 197 -32 197 197 -49 197 197 -82 189 189 -106 189 189 -123 189 189 -139 189 189 -156 189 189 -172 189 189 -189 189 189 -205 189 189 -222 189 189 -238 205 205 -246 205 205 -255 213 213 -0 222 197 -16 222 197 -32 213 197 -57 205 189 -90 205 189 -106 205 189 -123 205 189 -139 205 189 -156 205 189 -172 205 189 -189 205 189 -205 205 189 -222 205 189 -238 213 205 -246 213 205 -255 222 213 -0 238 189 -16 238 189 -41 222 180 -74 222 189 -90 222 189 -106 222 189 -123 222 189 -139 222 189 -156 222 189 -172 222 189 -189 222 189 -205 222 189 -222 222 189 -238 222 205 -246 230 205 -255 230 213 -0 255 189 -24 246 189 -57 238 189 -74 238 180 -90 238 189 -106 238 189 -123 238 189 -139 238 189 -164 238 189 -180 238 189 -205 238 205 -213 238 205 -230 238 205 -238 238 205 -246 238 205 -255 238 213 -8 255 180 -41 255 189 -57 255 180 -74 255 180 -90 255 189 -115 255 189 -131 246 189 -148 246 189 -164 246 189 -189 246 197 -205 246 205 -213 246 205 -230 246 205 -238 246 205 -246 246 205 -255 246 213 -32 255 180 -49 255 180 -65 255 180 -82 255 180 -106 255 189 -123 255 189 -139 255 189 -156 255 189 -180 255 205 -197 255 205 -213 255 213 -222 255 213 -230 255 213 -238 255 213 -246 255 213 -255 255 213 diff --git a/graphics/misc/sunny_day/27.pal b/graphics/misc/sunny_day/27.pal deleted file mode 100644 index a0af5ad233..0000000000 --- a/graphics/misc/sunny_day/27.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 222 -16 0 222 -32 0 222 -57 0 222 -74 0 222 -98 0 222 -115 0 222 -131 0 222 -156 0 222 -172 0 222 -197 0 222 -222 0 222 -238 0 213 -255 0 213 -255 8 205 -255 32 197 -0 16 222 -16 16 222 -32 16 222 -49 16 222 -74 16 222 -90 16 222 -115 16 222 -131 16 222 -156 16 222 -172 16 222 -197 16 222 -222 16 222 -238 16 213 -246 24 205 -255 41 205 -255 49 197 -0 41 222 -16 32 222 -32 32 213 -49 32 213 -74 32 213 -90 32 213 -115 32 213 -131 32 213 -148 32 213 -172 32 213 -197 32 213 -213 32 213 -222 41 205 -238 57 205 -255 57 205 -255 65 205 -0 57 222 -16 57 222 -32 57 213 -57 57 205 -74 57 205 -98 57 205 -115 57 205 -131 57 205 -148 57 205 -172 57 205 -189 57 205 -205 57 205 -222 74 205 -238 74 205 -255 74 205 -255 82 197 -0 82 222 -16 74 222 -32 74 213 -57 82 205 -90 90 205 -106 90 205 -123 90 205 -139 90 205 -156 90 205 -172 90 205 -189 90 205 -205 90 205 -222 90 205 -238 90 205 -255 90 205 -255 106 205 -0 98 222 -16 98 222 -32 98 213 -57 98 205 -90 106 205 -106 106 205 -123 106 205 -139 106 205 -156 106 205 -172 106 205 -189 106 205 -205 106 205 -222 106 205 -238 106 205 -255 115 205 -255 123 205 -0 115 222 -16 115 222 -32 115 213 -57 115 205 -90 123 205 -106 123 205 -123 123 205 -139 123 205 -156 123 205 -172 123 205 -189 123 205 -205 123 205 -222 123 205 -238 123 205 -246 131 205 -255 139 205 -0 139 222 -16 139 222 -32 139 213 -57 131 205 -90 139 205 -106 139 205 -123 139 205 -139 139 205 -156 139 205 -172 139 205 -189 139 205 -205 139 205 -222 139 205 -238 139 205 -246 148 205 -255 156 205 -0 156 222 -16 156 222 -32 156 213 -57 156 205 -90 156 205 -106 156 205 -123 156 205 -139 156 205 -156 156 205 -172 156 205 -189 156 205 -205 156 205 -222 156 205 -238 164 205 -246 164 205 -255 180 213 -0 180 222 -16 180 222 -32 172 213 -57 172 205 -90 172 205 -106 172 205 -123 172 205 -139 172 205 -156 172 205 -172 172 205 -189 172 205 -205 172 205 -222 172 205 -238 180 205 -246 189 213 -255 197 222 -0 197 222 -16 197 222 -32 197 213 -57 189 205 -90 189 205 -106 189 205 -123 189 205 -139 189 205 -156 189 205 -172 189 205 -189 189 205 -205 189 205 -222 189 205 -238 205 213 -246 205 213 -255 213 222 -0 222 222 -16 222 222 -32 213 213 -57 205 205 -90 205 205 -106 205 205 -123 205 205 -139 205 205 -156 205 205 -172 205 205 -189 205 205 -205 205 205 -230 213 213 -238 213 213 -255 222 222 -255 230 230 -0 238 213 -16 238 213 -41 222 205 -74 222 205 -90 222 205 -106 222 205 -123 222 205 -139 222 205 -156 222 205 -172 222 205 -189 222 205 -213 230 213 -230 230 213 -238 230 213 -255 230 222 -255 238 230 -0 255 213 -24 246 205 -57 238 197 -74 238 197 -90 238 205 -106 238 205 -123 238 205 -139 238 205 -164 238 205 -180 238 205 -205 238 213 -213 238 213 -230 238 213 -238 238 213 -255 238 222 -255 246 230 -8 255 205 -41 255 197 -57 255 205 -74 255 205 -90 255 197 -115 255 205 -131 246 205 -148 246 205 -164 246 205 -189 246 213 -205 246 213 -222 255 222 -230 255 222 -238 255 222 -255 255 222 -255 255 230 -32 255 197 -49 255 197 -65 255 197 -82 255 197 -106 255 197 -123 255 197 -139 255 205 -156 255 205 -180 255 213 -197 255 213 -213 255 222 -230 255 230 -238 255 230 -246 255 230 -255 255 230 -255 255 230 diff --git a/graphics/misc/sunny_day/28.pal b/graphics/misc/sunny_day/28.pal deleted file mode 100644 index fbc88233ae..0000000000 --- a/graphics/misc/sunny_day/28.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 238 -8 0 238 -32 0 238 -57 0 238 -74 0 238 -90 0 238 -115 0 238 -131 0 238 -156 0 238 -172 0 238 -189 0 238 -213 0 238 -238 0 238 -255 0 238 -255 8 222 -255 32 213 -0 16 238 -16 16 238 -32 16 238 -49 16 238 -74 16 238 -90 16 238 -115 16 238 -131 16 238 -148 16 238 -172 16 238 -189 16 238 -213 16 238 -238 16 238 -246 24 222 -255 41 222 -255 49 213 -0 32 238 -16 32 238 -41 41 222 -57 41 222 -74 41 222 -90 41 222 -115 41 222 -131 41 222 -148 41 222 -164 41 222 -180 41 222 -205 41 222 -222 41 222 -238 57 222 -255 57 222 -255 65 213 -0 57 238 -16 57 238 -41 57 222 -74 74 222 -90 74 222 -106 74 222 -123 74 222 -139 74 222 -156 74 222 -172 74 222 -189 74 222 -205 74 222 -222 74 222 -238 74 222 -255 74 222 -255 82 213 -0 74 238 -16 74 238 -41 82 222 -74 90 222 -90 90 222 -106 90 222 -123 90 222 -139 90 222 -156 90 222 -172 90 222 -189 90 222 -205 90 222 -222 90 222 -238 90 222 -255 90 222 -255 106 213 -0 98 238 -16 98 238 -41 98 222 -74 106 222 -90 106 222 -106 106 222 -123 106 222 -139 106 222 -156 106 222 -172 106 222 -189 106 222 -205 106 222 -222 106 222 -238 106 222 -255 115 222 -255 123 213 -0 115 238 -16 115 238 -41 115 222 -74 123 222 -90 123 222 -106 123 222 -123 123 222 -139 123 222 -156 123 222 -172 123 222 -189 123 222 -205 123 222 -222 123 222 -238 123 222 -246 131 222 -255 139 222 -0 139 238 -16 139 238 -41 131 222 -74 139 222 -90 139 222 -106 139 222 -123 139 222 -139 139 222 -156 139 222 -172 139 222 -189 139 222 -205 139 222 -222 139 222 -238 139 222 -246 148 222 -255 156 222 -0 156 238 -16 156 238 -41 148 222 -74 156 222 -90 156 222 -106 156 222 -123 156 222 -139 156 222 -156 156 222 -172 156 222 -189 156 222 -205 156 222 -222 156 222 -238 164 222 -246 164 222 -255 180 230 -0 172 238 -16 180 238 -41 172 222 -74 172 222 -90 172 222 -106 172 222 -123 172 222 -139 172 222 -156 172 222 -172 172 222 -189 172 222 -205 172 222 -222 172 222 -238 180 222 -246 189 230 -255 197 230 -0 197 238 -16 197 238 -41 189 222 -74 189 222 -90 189 222 -106 189 222 -123 189 222 -139 189 222 -156 189 222 -172 189 222 -189 189 222 -205 189 222 -222 189 222 -238 205 230 -246 205 230 -255 213 230 -0 213 238 -16 213 238 -41 205 222 -74 205 222 -90 205 222 -106 205 222 -123 205 222 -139 205 222 -156 205 222 -172 205 222 -189 205 222 -213 213 230 -230 213 230 -238 213 230 -255 222 230 -255 230 238 -0 238 238 -16 238 238 -41 222 222 -74 222 222 -90 222 222 -106 222 222 -123 222 222 -139 222 222 -156 222 222 -172 222 222 -189 222 222 -213 230 230 -230 230 230 -238 230 230 -255 238 238 -255 246 246 -0 255 230 -24 246 222 -57 238 222 -74 238 213 -90 238 222 -106 238 222 -123 238 222 -139 238 222 -164 238 222 -180 238 222 -205 238 222 -213 238 230 -230 238 230 -238 238 230 -255 246 238 -255 255 246 -8 255 222 -41 255 213 -57 255 213 -74 255 213 -90 255 213 -115 255 222 -131 246 222 -148 246 222 -164 246 222 -189 246 222 -205 246 230 -222 255 230 -238 255 238 -246 255 238 -255 255 238 -255 255 246 -32 255 213 -49 255 213 -65 255 213 -82 255 213 -106 255 213 -123 255 213 -139 255 213 -156 255 222 -180 255 222 -197 255 230 -213 255 230 -230 255 238 -246 255 246 -255 255 246 -255 255 246 -255 255 246 diff --git a/graphics/misc/sunny_day/29.pal b/graphics/misc/sunny_day/29.pal deleted file mode 100644 index 4786c3922f..0000000000 --- a/graphics/misc/sunny_day/29.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 255 -16 0 255 -32 0 255 -49 0 255 -74 0 255 -90 0 255 -115 0 255 -131 0 255 -148 0 255 -172 0 255 -189 0 255 -213 0 255 -230 0 255 -255 0 255 -255 8 238 -255 32 230 -0 16 255 -24 24 246 -41 24 246 -57 24 246 -82 24 246 -90 24 246 -115 24 246 -131 24 246 -148 24 246 -164 24 246 -189 24 246 -205 24 246 -222 24 246 -246 24 246 -255 41 238 -255 49 230 -0 41 255 -24 41 246 -57 57 238 -74 57 238 -90 57 238 -106 57 238 -123 57 238 -139 57 238 -156 57 238 -164 57 238 -189 57 238 -197 57 238 -222 57 238 -238 57 238 -255 57 238 -255 65 230 -0 57 255 -24 57 246 -57 74 238 -74 74 238 -90 74 238 -106 74 238 -123 74 238 -139 74 238 -156 74 238 -172 74 238 -180 74 238 -197 74 238 -213 74 238 -238 74 238 -255 74 238 -255 82 230 -0 74 255 -24 82 246 -57 90 238 -74 90 238 -90 90 238 -106 90 238 -123 90 238 -139 90 238 -156 90 238 -172 90 238 -189 90 238 -205 90 238 -222 90 238 -238 90 238 -255 90 238 -255 106 230 -0 98 255 -24 98 246 -57 106 238 -74 106 238 -90 106 238 -106 106 238 -123 106 238 -139 106 238 -156 106 238 -172 106 238 -189 106 238 -205 106 238 -222 106 238 -238 106 238 -255 115 238 -255 123 230 -0 115 255 -24 115 246 -57 123 238 -74 123 238 -90 123 238 -106 123 238 -123 123 238 -139 123 238 -156 123 238 -172 123 238 -189 123 238 -205 123 238 -222 123 238 -238 123 238 -246 131 238 -255 139 230 -0 139 255 -24 131 246 -57 139 238 -74 139 238 -90 139 238 -106 139 238 -123 139 238 -139 139 238 -156 139 238 -172 139 238 -189 139 238 -205 139 238 -222 139 238 -238 139 238 -246 148 238 -255 156 230 -0 156 255 -24 148 246 -57 156 238 -74 156 238 -90 156 238 -106 156 238 -123 156 238 -139 156 238 -164 164 238 -172 164 238 -189 164 238 -205 164 238 -222 164 238 -238 164 238 -246 164 238 -255 180 238 -0 172 255 -24 172 246 -57 172 238 -74 172 238 -90 172 238 -106 172 238 -123 172 238 -139 172 238 -164 172 238 -180 180 238 -189 180 238 -205 180 238 -222 180 238 -238 180 238 -246 189 238 -255 197 238 -0 197 255 -24 189 246 -57 189 238 -74 189 238 -90 189 238 -106 189 238 -123 189 238 -139 189 238 -164 189 238 -180 189 238 -205 205 238 -213 205 238 -222 205 238 -238 205 238 -246 205 238 -255 213 238 -0 213 255 -24 205 246 -57 205 238 -74 205 238 -90 205 238 -106 205 238 -123 205 238 -139 205 238 -164 205 238 -180 205 238 -205 213 238 -213 213 238 -230 213 238 -238 213 238 -255 222 238 -255 230 246 -0 238 255 -24 222 246 -57 222 238 -74 222 238 -90 222 238 -106 222 238 -123 222 238 -139 222 238 -164 222 238 -180 222 238 -205 230 238 -213 230 238 -230 230 238 -238 230 238 -255 238 246 -255 246 255 -0 255 255 -24 246 246 -57 238 238 -74 238 238 -90 238 238 -106 238 238 -123 238 238 -139 238 238 -164 238 238 -180 238 238 -205 238 238 -213 238 238 -230 238 238 -246 246 246 -255 255 255 -255 255 255 -8 255 238 -41 255 238 -57 255 230 -74 255 230 -90 255 230 -115 255 238 -131 246 230 -148 246 238 -164 246 230 -189 246 238 -205 246 238 -222 255 238 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -32 255 222 -49 255 230 -65 255 230 -82 255 230 -106 255 230 -123 255 230 -139 255 230 -156 255 230 -180 255 238 -197 255 238 -213 255 238 -230 255 246 -246 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/3.pal b/graphics/misc/sunny_day/3.pal deleted file mode 100644 index fc463f3016..0000000000 --- a/graphics/misc/sunny_day/3.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 57 -24 8 57 -41 8 57 -57 8 57 -74 8 57 -90 8 57 -106 8 57 -139 0 57 -156 0 57 -172 0 57 -189 0 57 -205 0 57 -222 0 57 -238 0 57 -255 0 57 -255 24 74 -8 24 57 -24 24 57 -41 24 57 -57 24 57 -74 24 57 -90 24 57 -115 16 57 -131 16 57 -156 16 57 -172 16 57 -189 16 57 -205 16 57 -222 16 57 -238 16 57 -246 32 65 -255 41 74 -8 41 57 -24 41 57 -41 41 57 -57 41 57 -74 41 57 -98 41 57 -115 41 57 -131 41 57 -148 32 57 -172 32 57 -189 32 57 -205 32 57 -222 32 57 -230 49 65 -246 49 65 -255 57 74 -8 57 57 -24 57 57 -41 57 57 -57 57 57 -74 57 57 -98 57 57 -115 57 57 -131 57 57 -148 57 57 -164 57 57 -189 49 49 -205 57 57 -213 65 65 -230 65 65 -246 65 65 -255 74 74 -8 74 57 -24 74 57 -41 74 57 -57 74 57 -74 74 57 -98 74 57 -115 74 57 -131 74 57 -148 74 57 -164 74 57 -189 74 49 -205 74 57 -213 82 65 -230 82 65 -246 82 65 -255 90 74 -8 90 57 -24 90 57 -41 98 57 -57 98 57 -74 98 57 -98 98 57 -115 90 57 -131 90 57 -148 90 57 -164 90 57 -189 90 49 -205 90 57 -213 98 65 -230 98 65 -246 98 65 -255 106 74 -8 106 57 -16 115 57 -41 115 57 -57 115 57 -74 115 57 -98 115 57 -115 115 57 -131 115 57 -148 106 57 -164 115 57 -189 106 49 -205 106 57 -213 115 65 -230 115 65 -246 115 65 -255 123 74 -0 139 57 -16 131 57 -41 131 57 -57 131 57 -74 131 57 -90 131 57 -115 131 57 -131 131 57 -148 131 57 -164 131 57 -189 131 49 -205 131 57 -213 131 65 -230 131 65 -246 131 65 -255 131 74 -0 156 57 -16 156 57 -32 148 57 -57 148 57 -74 148 57 -90 148 57 -115 148 57 -131 148 57 -148 148 57 -164 148 57 -189 148 49 -205 148 57 -213 148 65 -230 148 65 -246 148 65 -255 148 74 -0 172 57 -16 172 57 -32 172 57 -57 164 57 -74 164 57 -90 164 57 -115 164 57 -131 164 57 -148 164 57 -164 164 57 -189 164 49 -205 164 57 -213 164 65 -230 164 65 -246 164 65 -255 164 74 -0 189 49 -16 189 57 -32 189 49 -49 189 49 -74 189 49 -90 189 49 -106 189 49 -131 189 49 -148 189 49 -172 189 49 -189 189 49 -205 180 57 -213 180 65 -230 180 65 -246 180 65 -255 180 74 -0 205 57 -16 205 49 -32 205 49 -57 205 57 -74 205 57 -90 205 57 -106 205 57 -131 205 57 -148 205 57 -164 205 57 -189 205 57 -205 205 57 -213 197 65 -230 197 65 -246 197 65 -255 197 74 -0 222 57 -16 222 49 -32 222 49 -65 213 65 -82 213 65 -98 213 65 -115 213 65 -131 213 65 -148 213 65 -164 213 65 -180 213 65 -205 213 65 -213 213 65 -230 213 65 -246 213 65 -255 213 74 -0 238 49 -16 238 49 -49 230 65 -65 230 65 -82 230 65 -98 230 65 -115 230 65 -131 230 65 -148 230 65 -164 230 65 -180 230 65 -197 230 65 -213 230 65 -230 230 65 -246 230 65 -255 222 74 -0 255 49 -32 246 65 -49 246 65 -65 246 65 -90 246 65 -98 246 65 -123 246 65 -131 246 65 -156 246 65 -164 246 65 -180 246 65 -197 246 65 -213 246 65 -238 246 65 -246 246 65 -255 238 74 -24 255 65 -41 255 74 -57 255 74 -74 255 74 -90 255 74 -106 255 74 -123 255 74 -139 255 74 -156 255 74 -164 255 74 -180 255 74 -197 255 74 -213 255 74 -230 255 74 -246 255 74 -255 255 74 diff --git a/graphics/misc/sunny_day/30.pal b/graphics/misc/sunny_day/30.pal deleted file mode 100644 index de1492a5af..0000000000 --- a/graphics/misc/sunny_day/30.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 255 -24 8 255 -41 8 255 -57 8 255 -82 8 255 -98 8 255 -115 8 255 -131 8 255 -148 8 255 -164 8 255 -180 8 255 -205 8 255 -222 8 255 -238 8 255 -255 8 255 -255 32 246 -8 24 255 -41 41 255 -57 41 255 -74 41 255 -90 41 255 -106 41 255 -115 41 255 -139 41 255 -156 41 255 -164 41 255 -189 41 255 -197 41 255 -213 41 255 -238 41 255 -255 41 255 -255 49 246 -8 49 255 -41 57 255 -57 57 255 -74 57 255 -90 57 255 -106 57 255 -123 57 255 -139 57 255 -156 57 255 -164 57 255 -180 57 255 -205 57 255 -213 57 255 -230 57 255 -255 57 255 -255 65 246 -8 65 255 -41 74 255 -57 74 255 -74 74 255 -90 74 255 -106 74 255 -123 74 255 -139 74 255 -156 74 255 -172 74 255 -180 74 255 -205 74 255 -213 74 255 -230 74 255 -255 74 255 -255 82 246 -8 82 255 -41 90 255 -57 90 255 -74 90 255 -90 90 255 -106 90 255 -123 90 255 -139 90 255 -156 90 255 -172 90 255 -189 90 255 -197 90 255 -213 90 255 -230 90 255 -255 90 255 -255 106 246 -8 98 255 -41 106 255 -57 106 255 -74 106 255 -90 106 255 -115 115 255 -123 115 255 -139 115 255 -156 115 255 -172 115 255 -189 115 255 -205 115 255 -222 115 255 -238 115 255 -255 115 255 -255 123 246 -8 115 255 -41 123 255 -57 123 255 -74 123 255 -90 123 255 -115 123 255 -131 131 246 -139 131 246 -156 131 246 -172 131 246 -189 131 246 -205 131 246 -222 131 246 -230 131 246 -246 131 246 -255 139 246 -8 131 255 -41 139 255 -57 139 255 -74 139 255 -90 139 255 -115 139 255 -131 148 246 -148 148 246 -156 148 246 -172 148 246 -189 148 246 -205 148 246 -222 148 246 -238 148 246 -246 148 246 -255 156 246 -8 156 255 -41 156 255 -57 156 255 -74 156 255 -90 156 255 -115 156 255 -131 156 246 -148 164 246 -164 164 246 -172 164 246 -189 164 246 -205 164 246 -222 164 246 -230 164 246 -246 164 246 -255 180 246 -8 172 255 -41 172 255 -57 172 255 -74 172 255 -90 172 255 -115 172 255 -131 172 246 -148 180 246 -164 180 246 -189 189 246 -197 189 246 -213 189 246 -222 189 246 -238 189 246 -246 189 246 -255 197 246 -8 189 255 -41 189 255 -57 189 255 -74 189 255 -90 189 255 -115 189 255 -131 189 246 -148 189 246 -164 189 246 -189 205 246 -205 205 246 -213 205 246 -230 205 246 -238 205 246 -246 205 246 -255 213 246 -8 205 255 -41 205 255 -57 205 255 -74 205 255 -90 205 255 -115 205 255 -131 205 246 -148 205 246 -164 205 246 -189 213 246 -205 213 246 -222 222 255 -230 222 255 -238 222 255 -255 222 255 -255 230 255 -8 222 255 -41 222 255 -57 222 255 -74 222 255 -90 222 255 -115 222 255 -131 222 246 -148 222 246 -164 222 246 -189 230 246 -205 230 246 -222 230 255 -238 238 255 -246 238 255 -255 238 255 -255 246 255 -8 238 255 -41 238 255 -57 238 255 -74 238 255 -90 238 255 -115 238 255 -131 238 246 -148 238 246 -164 238 246 -189 238 246 -205 238 246 -222 238 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -8 255 255 -41 255 255 -57 255 255 -74 255 255 -90 255 255 -115 255 255 -131 246 246 -148 246 246 -164 246 246 -189 246 246 -205 246 246 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -32 255 238 -49 255 238 -65 255 246 -82 255 238 -106 255 246 -123 255 246 -139 255 246 -156 255 246 -180 255 246 -197 255 246 -213 255 246 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/31.pal b/graphics/misc/sunny_day/31.pal deleted file mode 100644 index c48c846ade..0000000000 --- a/graphics/misc/sunny_day/31.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -32 32 255 -49 32 255 -57 32 255 -74 32 255 -90 32 255 -106 32 255 -123 32 255 -139 32 255 -148 32 255 -164 32 255 -180 32 255 -197 32 255 -213 32 255 -222 32 255 -238 32 255 -255 32 255 -32 49 255 -49 49 255 -65 49 255 -82 49 255 -90 49 255 -106 49 255 -123 49 255 -139 49 255 -156 49 255 -172 49 255 -180 49 255 -197 49 255 -213 49 255 -230 49 255 -238 49 255 -255 49 255 -32 65 255 -49 65 255 -65 65 255 -82 65 255 -98 65 255 -106 65 255 -123 65 255 -139 65 255 -156 65 255 -172 65 255 -180 65 255 -197 65 255 -213 65 255 -230 65 255 -246 65 255 -255 65 255 -32 82 255 -49 82 255 -65 82 255 -82 82 255 -98 82 255 -115 82 255 -131 82 255 -139 82 255 -156 82 255 -172 82 255 -180 82 255 -197 82 255 -213 82 255 -230 82 255 -238 82 255 -255 82 255 -32 98 255 -49 98 255 -65 98 255 -82 98 255 -106 106 255 -115 106 255 -131 106 255 -148 106 255 -156 106 255 -172 106 255 -189 106 255 -197 106 255 -213 106 255 -230 106 255 -246 106 255 -255 106 255 -32 106 255 -49 115 255 -65 115 255 -82 115 255 -106 115 255 -123 123 255 -131 123 255 -148 123 255 -156 123 255 -172 123 255 -189 123 255 -197 123 255 -213 123 255 -230 123 255 -246 123 255 -255 123 255 -32 123 255 -49 131 255 -65 131 255 -82 131 255 -106 131 255 -123 131 255 -139 139 255 -148 139 255 -164 139 255 -172 139 255 -189 139 255 -205 139 255 -213 139 255 -230 139 255 -246 139 255 -255 139 255 -32 139 255 -49 139 255 -65 139 255 -82 139 255 -106 148 255 -123 148 255 -139 148 255 -156 156 255 -164 156 255 -180 156 255 -189 156 255 -205 156 255 -222 156 255 -230 156 255 -246 156 255 -255 156 255 -32 156 255 -49 156 255 -65 156 255 -82 156 255 -106 156 255 -123 164 255 -139 164 255 -156 164 255 -180 180 255 -189 180 255 -205 180 255 -213 180 255 -222 180 255 -238 180 255 -246 180 255 -255 180 255 -32 172 255 -49 172 255 -65 172 255 -82 172 255 -106 172 255 -123 172 255 -139 180 255 -156 180 255 -180 189 255 -197 197 255 -205 197 255 -213 197 255 -230 197 255 -238 197 255 -246 197 255 -255 197 255 -32 180 255 -49 189 255 -65 189 255 -82 189 255 -106 189 255 -123 189 255 -139 189 255 -156 197 255 -180 205 255 -197 205 255 -213 213 255 -222 213 255 -230 213 255 -238 213 255 -246 213 255 -255 213 255 -32 197 255 -49 197 255 -65 205 255 -82 197 255 -106 205 255 -123 205 255 -139 205 255 -156 205 255 -180 213 255 -197 222 255 -213 222 255 -230 230 255 -238 230 255 -246 230 255 -255 230 255 -255 230 255 -32 213 255 -49 213 255 -65 213 255 -82 213 255 -106 213 255 -123 213 255 -139 222 255 -156 222 255 -180 230 255 -197 230 255 -213 230 255 -230 238 255 -246 246 255 -255 246 255 -255 246 255 -255 246 255 -32 230 255 -49 230 255 -65 230 255 -82 230 255 -106 230 255 -123 230 255 -139 230 255 -156 230 255 -180 238 255 -197 238 255 -213 238 255 -230 246 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -32 246 255 -49 246 255 -65 246 255 -82 246 255 -106 246 255 -123 246 255 -139 246 255 -156 246 255 -180 246 255 -197 246 255 -213 246 255 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -32 255 255 -49 255 255 -65 255 255 -82 255 255 -106 255 255 -123 255 255 -139 255 255 -156 255 255 -180 255 255 -197 255 255 -213 255 255 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/32.pal b/graphics/misc/sunny_day/32.pal deleted file mode 100644 index 238ca8950b..0000000000 --- a/graphics/misc/sunny_day/32.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 8 -24 8 8 -41 8 8 -57 8 8 -74 8 8 -90 8 8 -106 8 8 -156 0 0 -180 0 0 -197 0 0 -213 0 0 -230 0 0 -246 0 0 -255 0 0 -255 16 16 -255 49 49 -8 24 8 -24 24 8 -41 24 8 -57 24 8 -74 24 8 -90 24 8 -106 24 8 -156 16 0 -180 16 0 -197 16 0 -213 16 0 -230 16 0 -246 16 0 -255 16 0 -255 32 16 -255 57 49 -8 41 8 -24 41 8 -41 41 8 -57 41 8 -74 41 8 -90 41 8 -106 41 8 -156 41 0 -180 41 0 -197 41 0 -213 32 0 -230 32 0 -246 32 0 -255 41 0 -255 49 16 -255 74 49 -8 57 8 -24 57 8 -41 57 8 -57 57 8 -74 57 8 -90 57 8 -106 57 8 -156 65 0 -180 65 0 -197 57 0 -213 57 0 -230 57 0 -246 57 0 -255 57 0 -255 65 16 -255 82 49 -8 74 8 -24 74 8 -41 74 8 -57 74 8 -74 74 8 -90 74 8 -106 74 8 -156 90 0 -180 90 0 -197 82 0 -213 82 0 -230 74 0 -246 74 0 -255 82 0 -255 90 16 -255 98 49 -8 90 8 -24 90 8 -41 90 8 -57 90 8 -74 90 8 -90 90 8 -106 90 8 -156 115 0 -180 106 0 -197 106 0 -213 106 0 -230 98 0 -246 98 0 -255 98 0 -255 98 16 -255 115 49 -8 106 8 -24 106 8 -41 106 8 -57 106 8 -74 106 8 -90 106 8 -106 106 8 -156 139 0 -180 131 0 -197 123 0 -213 123 0 -230 123 0 -246 123 0 -255 115 0 -255 115 16 -255 123 49 -0 156 0 -24 156 0 -49 156 0 -65 156 0 -90 156 0 -115 156 0 -139 156 0 -156 156 0 -180 156 0 -197 148 0 -213 148 0 -230 139 0 -246 139 0 -255 139 0 -255 139 16 -255 139 49 -0 180 0 -24 180 0 -41 180 0 -65 180 0 -90 180 0 -115 180 0 -131 180 0 -156 180 0 -180 180 0 -197 172 0 -213 164 0 -230 164 0 -246 156 0 -255 156 0 -255 156 16 -255 156 49 -0 197 0 -16 197 0 -41 197 0 -65 197 0 -82 197 0 -106 197 0 -131 197 0 -156 197 0 -172 197 0 -197 197 0 -213 189 0 -230 180 0 -246 180 0 -255 180 0 -255 172 16 -255 172 49 -0 213 0 -16 213 0 -41 213 0 -57 213 0 -82 213 0 -106 213 0 -123 213 0 -148 213 0 -172 213 0 -189 213 0 -213 213 0 -230 205 0 -246 197 0 -255 197 0 -255 189 16 -255 180 49 -0 230 0 -16 230 0 -41 230 0 -65 230 0 -82 230 0 -106 230 0 -123 230 0 -148 230 0 -164 230 0 -189 230 0 -213 230 0 -230 230 0 -246 222 0 -255 213 0 -255 205 16 -255 197 49 -0 246 0 -16 246 0 -41 246 0 -57 246 0 -82 246 0 -98 246 0 -123 246 0 -139 246 0 -164 246 0 -180 246 0 -205 246 0 -230 246 0 -246 246 0 -255 238 0 -255 222 16 -255 213 49 -0 255 0 -24 255 0 -41 255 0 -57 255 0 -82 255 0 -98 255 0 -123 255 0 -139 255 0 -156 255 0 -180 255 0 -197 255 0 -222 255 0 -238 255 0 -255 255 0 -255 238 16 -255 230 49 -16 255 16 -41 255 16 -57 255 16 -74 255 16 -90 255 16 -106 255 16 -123 255 16 -139 255 16 -156 255 16 -172 255 16 -189 255 16 -213 255 16 -230 255 16 -246 255 16 -255 255 16 -255 238 49 -49 255 49 -57 255 49 -74 255 49 -90 255 49 -98 255 49 -115 255 49 -131 255 49 -148 255 49 -156 255 49 -172 255 49 -189 255 49 -205 255 49 -213 255 49 -230 255 49 -246 255 49 -255 255 49 diff --git a/graphics/misc/sunny_day/33.pal b/graphics/misc/sunny_day/33.pal deleted file mode 100644 index e616bd8496..0000000000 --- a/graphics/misc/sunny_day/33.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 24 -24 8 24 -41 8 24 -57 8 24 -74 8 24 -90 8 24 -106 8 24 -156 0 24 -180 0 24 -197 0 16 -213 0 16 -230 0 16 -246 0 16 -255 0 24 -255 16 41 -255 49 57 -8 24 24 -24 24 24 -41 24 24 -57 24 24 -74 24 24 -90 24 24 -139 24 24 -156 16 16 -172 16 16 -189 16 16 -213 16 16 -230 16 16 -246 16 16 -246 32 32 -255 49 49 -255 65 65 -8 41 24 -24 41 24 -41 41 24 -57 41 24 -74 41 24 -90 41 24 -139 41 24 -156 41 16 -172 41 16 -189 41 16 -213 32 16 -230 32 16 -246 32 16 -246 41 32 -255 65 49 -255 74 65 -8 57 24 -24 57 24 -41 57 24 -57 57 24 -74 57 24 -90 57 24 -139 65 24 -156 65 16 -172 65 16 -189 57 16 -213 57 16 -230 49 16 -246 57 16 -246 65 32 -255 82 49 -255 90 65 -8 74 24 -24 74 24 -41 74 24 -57 74 24 -74 74 24 -90 74 24 -139 90 24 -156 90 16 -172 82 16 -189 82 16 -213 74 16 -230 74 16 -246 74 16 -246 82 32 -255 90 49 -255 98 65 -8 90 24 -24 90 24 -41 90 24 -57 90 24 -74 90 24 -90 90 24 -139 115 24 -156 106 16 -172 106 16 -189 106 16 -213 98 16 -230 98 16 -246 98 16 -246 98 32 -255 115 49 -255 115 65 -8 106 24 -24 139 24 -41 139 24 -65 139 24 -90 139 24 -115 139 24 -139 139 24 -156 131 16 -172 123 16 -189 123 16 -213 123 16 -230 123 16 -246 115 16 -246 115 32 -255 123 49 -255 131 65 -0 156 16 -16 156 16 -41 156 16 -65 156 16 -90 156 16 -106 156 16 -131 156 16 -156 156 16 -172 148 16 -189 148 16 -213 139 16 -230 139 16 -246 139 16 -246 139 32 -255 139 49 -255 148 65 -0 180 16 -16 172 16 -41 172 16 -65 172 16 -82 172 16 -106 172 16 -131 172 16 -156 172 16 -172 172 16 -189 172 16 -213 164 16 -230 164 16 -246 156 16 -246 156 32 -255 156 49 -255 164 65 -0 197 16 -16 189 16 -41 189 16 -57 189 16 -82 189 16 -106 189 16 -131 189 16 -148 189 16 -172 189 16 -189 189 16 -213 189 16 -230 180 16 -246 180 16 -246 172 32 -255 172 49 -255 172 65 -0 213 16 -16 213 16 -32 213 16 -57 213 16 -82 213 16 -106 213 16 -123 213 16 -148 213 16 -172 213 16 -189 213 16 -213 213 16 -230 205 16 -246 197 16 -246 189 32 -255 189 49 -255 189 65 -0 230 16 -16 230 16 -32 230 16 -57 230 16 -74 230 16 -98 230 16 -123 230 16 -139 230 16 -164 230 16 -189 230 16 -205 230 16 -230 230 16 -246 222 16 -246 205 32 -255 205 49 -255 197 65 -0 246 16 -16 246 16 -41 246 16 -57 246 16 -82 246 16 -98 246 16 -123 246 16 -139 246 16 -164 246 16 -180 246 16 -205 246 16 -222 246 16 -246 246 16 -246 222 32 -255 222 49 -255 213 65 -0 255 16 -32 246 32 -49 246 32 -65 246 32 -82 246 32 -98 246 32 -123 246 32 -139 246 32 -156 246 32 -172 246 32 -189 246 32 -213 246 32 -230 246 32 -246 246 32 -255 238 49 -255 230 65 -16 255 32 -49 255 49 -65 255 49 -82 255 49 -98 255 49 -115 255 49 -131 255 49 -148 255 49 -164 255 49 -172 255 49 -197 255 49 -205 255 49 -222 255 49 -238 255 49 -255 255 49 -255 246 65 -49 255 57 -65 255 65 -82 255 65 -90 255 65 -106 255 65 -123 255 65 -131 255 65 -148 255 65 -164 255 65 -180 255 65 -189 255 65 -205 255 65 -222 255 65 -230 255 65 -246 255 65 -255 255 65 diff --git a/graphics/misc/sunny_day/34.pal b/graphics/misc/sunny_day/34.pal deleted file mode 100644 index 0ddddc4448..0000000000 --- a/graphics/misc/sunny_day/34.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 41 -24 8 41 -41 8 41 -57 8 41 -74 8 41 -90 8 41 -106 8 41 -156 0 49 -180 0 41 -197 0 41 -213 0 41 -230 0 41 -246 0 41 -255 0 41 -255 16 57 -255 49 74 -8 24 41 -24 24 41 -41 24 41 -57 24 41 -74 24 41 -90 24 41 -139 24 41 -156 16 41 -172 16 41 -189 16 41 -213 16 32 -230 16 32 -246 16 41 -246 32 49 -255 49 65 -255 65 82 -8 41 41 -24 41 41 -41 41 41 -57 41 41 -74 41 41 -115 41 41 -131 41 41 -156 41 41 -172 32 32 -189 32 32 -205 32 32 -222 41 41 -230 49 49 -238 65 65 -255 65 65 -255 82 82 -8 57 41 -24 57 41 -41 57 41 -57 57 41 -74 57 41 -115 65 41 -131 65 41 -156 57 41 -172 57 32 -189 57 32 -205 57 32 -222 57 41 -230 65 49 -238 82 65 -255 82 65 -255 90 82 -8 74 41 -24 74 41 -41 74 41 -57 74 41 -74 74 41 -115 90 41 -131 90 41 -156 82 41 -172 82 32 -189 82 32 -205 74 32 -222 74 41 -230 82 49 -238 90 65 -255 98 65 -255 106 82 -8 90 41 -24 90 41 -41 115 41 -65 115 41 -90 115 41 -115 115 41 -131 106 41 -156 106 41 -172 106 32 -189 98 32 -205 98 32 -222 98 41 -230 98 49 -238 115 65 -255 115 65 -255 115 82 -8 106 41 -24 139 41 -41 131 41 -65 131 41 -90 131 41 -106 131 41 -131 131 41 -156 131 41 -172 123 32 -189 123 32 -205 123 32 -222 115 41 -230 115 49 -238 123 65 -255 123 65 -255 131 82 -0 156 41 -16 156 41 -41 156 41 -57 156 41 -82 156 41 -106 156 41 -131 156 41 -156 156 41 -172 148 32 -189 148 32 -205 139 32 -222 139 41 -230 139 49 -238 139 65 -255 139 65 -255 148 82 -0 180 41 -16 172 41 -32 172 32 -57 172 32 -82 172 32 -106 172 32 -123 172 32 -148 172 32 -172 172 32 -189 164 32 -205 164 32 -222 156 41 -230 156 49 -238 156 65 -255 164 65 -255 156 82 -0 197 41 -16 189 41 -32 189 32 -57 189 32 -82 189 32 -98 189 32 -123 189 32 -148 189 32 -172 189 32 -189 189 32 -205 189 32 -222 180 41 -230 172 49 -238 172 65 -255 172 65 -255 172 82 -0 213 32 -16 213 32 -32 205 32 -57 205 32 -74 205 32 -98 205 32 -123 205 32 -148 205 32 -164 205 32 -189 205 32 -205 205 32 -222 197 41 -230 189 49 -238 189 65 -255 189 65 -255 189 82 -0 230 32 -16 230 32 -41 222 41 -57 222 41 -82 222 41 -98 222 41 -123 222 41 -139 222 41 -164 222 41 -180 222 41 -205 222 41 -222 222 41 -230 205 49 -238 205 65 -255 205 65 -255 205 82 -0 246 32 -16 246 32 -49 230 49 -65 230 49 -82 230 49 -98 230 49 -123 230 49 -139 230 49 -156 230 49 -172 230 49 -189 230 49 -213 230 49 -230 230 49 -238 222 65 -255 222 65 -255 213 82 -0 255 41 -32 246 41 -65 238 65 -82 238 65 -98 238 65 -115 238 65 -131 238 65 -148 238 65 -164 238 65 -172 238 65 -189 238 65 -205 238 65 -222 238 65 -238 238 65 -255 238 65 -255 230 82 -16 255 49 -49 255 65 -65 255 65 -82 255 65 -98 255 65 -115 255 65 -131 255 65 -148 255 65 -164 255 65 -172 255 65 -189 255 65 -205 255 65 -222 255 65 -238 255 65 -255 255 65 -255 246 82 -49 255 74 -65 255 74 -82 255 82 -90 255 82 -106 255 82 -123 255 82 -139 255 82 -148 255 82 -164 255 82 -180 255 82 -189 255 82 -205 255 82 -213 255 82 -230 255 82 -246 255 82 -255 255 82 diff --git a/graphics/misc/sunny_day/35.pal b/graphics/misc/sunny_day/35.pal deleted file mode 100644 index 8f81dda6d0..0000000000 --- a/graphics/misc/sunny_day/35.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 57 -24 8 57 -41 8 57 -57 8 57 -74 8 57 -90 8 57 -106 8 57 -156 0 65 -180 0 65 -197 0 65 -213 0 57 -230 0 65 -246 0 57 -255 0 57 -255 16 74 -255 49 90 -8 24 57 -24 24 57 -41 24 57 -57 24 57 -74 24 57 -90 24 57 -139 24 65 -156 16 65 -172 16 65 -189 16 57 -213 16 57 -230 16 57 -246 16 57 -246 32 65 -255 49 82 -255 65 90 -8 41 57 -24 41 57 -41 41 57 -57 41 57 -74 41 57 -115 41 65 -131 41 65 -156 41 57 -172 32 57 -189 32 57 -205 32 57 -222 41 57 -230 49 65 -238 65 82 -255 65 82 -255 82 90 -8 57 57 -24 57 57 -41 57 57 -57 57 57 -90 65 65 -115 65 65 -131 57 57 -148 57 57 -172 57 57 -189 57 57 -205 57 57 -213 65 65 -222 82 82 -238 82 82 -255 82 82 -255 98 98 -8 74 57 -24 74 57 -41 74 57 -65 90 65 -90 90 65 -115 90 65 -131 82 57 -148 82 57 -172 74 57 -189 74 57 -205 74 57 -213 82 65 -222 90 82 -238 98 82 -255 98 82 -255 106 98 -8 90 57 -24 90 57 -41 115 65 -65 115 65 -90 115 65 -115 115 65 -131 106 57 -148 106 57 -172 98 57 -189 98 57 -205 98 57 -213 98 65 -222 115 82 -238 115 82 -255 115 82 -255 123 98 -8 106 57 -24 139 65 -41 131 65 -57 131 57 -82 131 57 -106 131 57 -131 131 57 -148 131 57 -172 123 57 -189 123 57 -205 115 57 -213 115 65 -222 123 82 -238 123 82 -255 131 82 -255 139 98 -0 156 65 -16 156 65 -41 156 57 -57 148 57 -82 148 57 -106 148 57 -131 148 57 -148 148 57 -172 148 57 -189 139 57 -205 139 57 -213 139 65 -222 139 82 -238 139 82 -255 139 82 -255 148 98 -0 180 65 -16 172 65 -32 172 57 -57 172 57 -82 172 57 -98 172 57 -123 172 57 -148 172 57 -172 172 57 -189 164 57 -205 156 57 -213 156 65 -222 156 82 -238 164 82 -255 164 82 -255 164 98 -0 197 57 -16 189 57 -32 189 57 -57 189 57 -74 189 57 -98 189 57 -123 189 57 -139 189 57 -164 189 57 -189 189 57 -205 180 57 -213 172 65 -222 172 82 -238 172 82 -255 172 82 -255 180 98 -0 213 57 -16 213 57 -32 205 57 -57 205 57 -74 205 57 -98 205 57 -123 205 57 -139 205 57 -164 205 57 -180 205 57 -205 205 57 -213 189 65 -222 189 82 -238 189 82 -255 189 82 -255 189 98 -0 230 57 -16 230 49 -41 222 57 -65 213 65 -82 213 65 -98 213 65 -123 213 65 -139 213 65 -156 213 65 -172 213 65 -197 213 65 -213 213 65 -222 205 82 -238 205 82 -255 205 82 -255 205 98 -0 246 57 -16 246 57 -49 230 65 -82 222 82 -98 222 82 -115 222 82 -131 222 82 -148 222 82 -164 222 82 -172 222 82 -189 222 82 -213 222 82 -222 222 82 -238 222 82 -255 222 82 -255 222 98 -0 255 57 -32 246 65 -65 238 82 -82 238 82 -98 238 82 -115 238 82 -131 238 82 -148 238 82 -164 238 82 -172 238 82 -189 238 82 -205 238 82 -222 238 82 -238 238 82 -255 238 82 -255 230 98 -16 255 65 -49 255 82 -65 255 82 -82 255 82 -98 255 82 -115 255 82 -131 255 82 -148 255 82 -164 255 82 -180 255 82 -189 255 82 -205 255 82 -222 255 82 -238 255 82 -255 255 82 -255 246 98 -49 255 82 -65 255 90 -82 255 90 -98 255 98 -106 255 98 -123 255 98 -139 255 98 -148 255 98 -164 255 98 -180 255 98 -189 255 98 -205 255 98 -222 255 98 -230 255 98 -246 255 98 -255 255 98 diff --git a/graphics/misc/sunny_day/36.pal b/graphics/misc/sunny_day/36.pal deleted file mode 100644 index 4797f38878..0000000000 --- a/graphics/misc/sunny_day/36.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 74 -24 8 74 -41 8 74 -57 8 74 -74 8 74 -90 8 74 -106 8 74 -156 0 90 -180 0 90 -197 0 82 -213 0 82 -230 0 82 -246 0 82 -255 0 82 -255 16 90 -255 49 98 -8 24 74 -24 24 74 -41 24 74 -57 24 74 -74 24 74 -90 24 74 -139 24 90 -156 16 90 -172 16 82 -189 16 82 -213 16 82 -230 16 74 -246 16 82 -246 32 82 -255 49 98 -255 65 106 -8 41 74 -24 41 74 -41 41 74 -57 41 74 -74 41 74 -115 41 90 -131 41 90 -156 41 82 -172 32 82 -189 32 82 -205 32 74 -222 41 82 -230 49 82 -238 65 98 -255 65 98 -255 82 106 -8 57 74 -24 57 74 -41 57 74 -65 65 90 -90 65 90 -115 65 90 -131 57 82 -148 57 82 -172 57 82 -189 57 74 -205 57 74 -213 65 82 -222 82 98 -238 82 98 -255 82 98 -255 98 106 -8 74 74 -24 74 74 -41 74 74 -65 90 90 -90 82 82 -106 82 82 -131 82 82 -148 74 74 -164 74 74 -180 74 74 -197 82 82 -205 98 98 -222 98 98 -238 98 98 -255 98 98 -255 115 115 -8 90 74 -24 90 74 -41 115 90 -65 115 90 -82 106 82 -106 106 82 -131 106 82 -148 98 74 -164 98 74 -180 98 74 -197 98 82 -205 115 98 -222 115 98 -238 115 98 -255 115 98 -255 123 115 -8 106 74 -24 139 90 -41 131 90 -57 131 82 -82 131 82 -106 131 82 -131 131 82 -148 123 74 -164 123 74 -180 115 74 -197 115 82 -205 131 98 -222 131 98 -238 131 98 -255 131 98 -255 139 115 -0 156 90 -16 156 90 -41 156 82 -57 148 82 -74 148 74 -98 148 74 -123 148 74 -148 148 74 -164 148 74 -180 139 74 -197 139 82 -205 139 98 -222 139 98 -238 139 98 -255 148 98 -255 156 115 -0 180 90 -16 172 82 -32 172 82 -57 172 74 -74 164 74 -98 164 74 -123 164 74 -148 164 74 -164 164 74 -180 164 74 -197 156 82 -205 156 98 -222 164 98 -238 156 98 -255 156 98 -255 164 115 -0 197 82 -16 189 82 -32 189 82 -57 189 74 -74 180 74 -98 180 74 -123 180 74 -139 180 74 -164 180 74 -180 180 74 -197 172 82 -205 172 98 -222 172 98 -238 172 98 -255 180 98 -255 180 115 -0 213 82 -16 213 74 -32 205 74 -57 205 74 -82 197 82 -98 197 82 -123 197 82 -139 197 82 -156 197 82 -172 197 82 -197 197 82 -205 189 98 -222 189 98 -238 189 98 -255 189 98 -255 189 115 -0 230 74 -16 230 74 -41 222 74 -65 213 82 -98 205 98 -115 205 98 -131 205 98 -148 205 98 -164 205 98 -172 205 98 -197 205 98 -205 205 98 -222 205 98 -238 205 98 -255 205 98 -255 205 115 -0 246 74 -16 246 74 -49 230 82 -82 222 90 -98 222 98 -115 222 98 -131 222 98 -148 222 98 -164 222 98 -180 222 98 -189 222 98 -205 222 98 -222 222 98 -238 222 98 -255 222 98 -255 213 115 -0 255 82 -32 246 82 -65 238 90 -82 238 98 -98 238 98 -115 238 98 -131 238 98 -148 238 98 -164 238 98 -180 238 98 -189 238 98 -205 238 98 -222 238 98 -238 238 98 -255 238 98 -255 230 115 -16 255 90 -49 255 90 -65 255 98 -82 255 98 -98 255 98 -115 255 98 -131 255 98 -148 255 98 -164 255 98 -180 255 98 -189 255 98 -205 255 98 -222 255 98 -238 255 98 -255 255 98 -255 246 115 -49 255 98 -65 255 98 -82 255 106 -98 255 106 -115 255 115 -131 255 115 -139 255 115 -156 255 115 -164 255 115 -180 255 115 -197 255 115 -205 255 115 -222 255 115 -230 255 115 -246 255 115 -255 255 115 diff --git a/graphics/misc/sunny_day/37.pal b/graphics/misc/sunny_day/37.pal deleted file mode 100644 index f65232b011..0000000000 --- a/graphics/misc/sunny_day/37.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 90 -24 8 90 -41 8 90 -57 8 90 -74 8 90 -90 8 90 -106 8 90 -156 0 115 -180 0 115 -197 0 106 -213 0 106 -230 0 106 -246 0 98 -255 0 98 -255 16 106 -255 49 115 -8 24 90 -24 24 90 -41 24 90 -57 24 90 -74 24 90 -90 24 90 -139 24 115 -156 16 106 -172 16 106 -189 16 106 -213 16 106 -230 16 98 -246 16 98 -246 32 98 -255 49 115 -255 65 123 -8 41 90 -24 41 90 -41 41 115 -65 41 115 -90 41 115 -115 41 115 -131 41 106 -156 41 106 -172 32 106 -189 32 98 -205 32 98 -222 41 98 -230 49 98 -238 65 115 -255 65 115 -255 82 123 -8 57 90 -24 57 90 -41 65 115 -65 65 115 -90 65 115 -115 65 115 -131 57 106 -148 57 106 -172 57 98 -189 57 98 -205 57 98 -213 65 98 -222 82 115 -238 82 115 -255 82 115 -255 98 123 -8 74 90 -24 74 90 -41 90 115 -65 90 115 -82 82 106 -106 82 106 -131 82 106 -148 74 98 -164 74 98 -180 74 98 -197 82 98 -205 98 115 -222 98 115 -238 98 115 -255 98 115 -255 115 131 -8 90 90 -24 90 90 -41 115 115 -65 115 115 -82 106 106 -106 98 98 -131 98 98 -148 98 98 -164 98 98 -180 98 98 -197 106 106 -205 115 115 -222 115 115 -238 115 115 -255 123 123 -255 131 131 -8 106 90 -24 139 115 -41 131 106 -57 131 106 -82 131 106 -98 131 98 -131 131 98 -148 123 98 -164 115 98 -180 115 98 -197 123 106 -205 123 115 -222 131 115 -238 131 115 -255 131 123 -255 139 131 -0 156 115 -16 156 106 -41 156 106 -57 148 106 -74 148 98 -98 148 98 -123 148 98 -148 148 98 -164 139 98 -180 139 98 -197 139 106 -205 139 115 -222 148 115 -238 148 115 -255 148 123 -255 156 131 -0 180 106 -16 172 106 -32 172 106 -57 172 98 -74 164 98 -98 164 98 -115 164 98 -139 164 98 -164 164 98 -180 156 98 -197 156 106 -205 164 115 -222 156 115 -238 164 115 -255 164 123 -255 164 131 -0 197 106 -16 189 106 -32 189 98 -57 189 98 -74 180 98 -98 180 98 -115 180 98 -139 180 98 -156 180 98 -180 180 98 -197 172 106 -205 172 115 -222 172 115 -238 180 115 -255 180 123 -255 180 131 -0 213 106 -16 213 98 -32 205 98 -57 205 98 -82 197 98 -106 197 106 -123 197 106 -139 197 106 -164 197 106 -180 197 106 -197 197 106 -205 189 115 -222 189 115 -238 189 115 -255 189 123 -255 197 131 -0 230 98 -16 230 98 -41 222 98 -65 213 98 -98 205 115 -115 205 115 -131 205 115 -148 205 115 -164 205 115 -172 205 115 -189 205 115 -205 205 115 -222 205 115 -238 205 115 -255 205 123 -255 205 131 -0 246 98 -16 246 98 -49 230 98 -82 222 115 -98 222 115 -115 222 115 -131 222 115 -148 222 115 -164 222 115 -180 222 115 -189 222 115 -213 222 115 -222 222 115 -238 222 115 -255 222 123 -255 222 131 -0 255 98 -32 246 98 -65 238 115 -82 238 115 -98 238 115 -115 238 115 -131 238 115 -148 238 115 -164 238 115 -180 238 115 -197 238 115 -205 238 115 -222 238 115 -238 238 115 -255 238 123 -255 230 131 -16 255 98 -49 255 115 -65 255 115 -82 255 115 -98 255 115 -123 255 123 -131 255 123 -148 255 123 -164 255 123 -180 255 123 -197 255 123 -205 255 123 -222 255 123 -238 255 123 -255 255 123 -255 246 131 -49 255 115 -65 255 115 -82 255 115 -98 255 123 -115 255 123 -131 255 131 -139 255 131 -156 255 131 -172 255 131 -180 255 131 -197 255 131 -205 255 131 -222 255 131 -230 255 131 -246 255 131 -255 255 131 diff --git a/graphics/misc/sunny_day/38.pal b/graphics/misc/sunny_day/38.pal deleted file mode 100644 index ddb2442fbf..0000000000 --- a/graphics/misc/sunny_day/38.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 106 -24 8 106 -41 8 106 -57 8 106 -74 8 106 -90 8 106 -106 8 106 -156 0 139 -180 0 131 -197 0 131 -213 0 123 -230 0 123 -246 0 123 -255 0 123 -255 16 123 -255 49 131 -8 24 106 -24 24 139 -41 24 139 -65 24 139 -90 24 139 -115 24 139 -139 24 139 -156 16 131 -172 16 131 -189 16 131 -213 16 123 -230 16 123 -246 16 123 -246 32 123 -255 49 131 -255 65 131 -8 41 106 -24 41 139 -41 41 131 -65 41 131 -90 41 131 -106 41 131 -131 41 131 -156 41 131 -172 32 123 -189 32 123 -205 32 123 -222 41 123 -230 49 123 -238 65 131 -255 65 131 -255 82 139 -8 57 106 -24 65 139 -41 65 131 -57 57 131 -82 57 131 -106 57 131 -131 57 131 -148 57 131 -172 57 123 -189 57 123 -205 57 123 -213 65 123 -222 82 131 -238 82 131 -255 82 131 -255 98 139 -8 74 106 -24 90 139 -41 90 131 -57 82 131 -82 82 131 -106 82 131 -131 82 131 -148 74 123 -164 74 123 -180 74 123 -197 82 123 -205 98 131 -222 98 131 -238 98 131 -255 98 131 -255 115 139 -8 90 106 -24 115 139 -41 106 131 -57 106 131 -82 106 131 -98 98 131 -131 98 131 -148 98 123 -164 98 115 -180 98 115 -197 106 123 -205 115 131 -222 115 131 -238 115 131 -255 123 131 -255 131 139 -8 106 106 -24 139 139 -41 131 131 -57 131 131 -82 131 131 -98 131 131 -123 115 115 -148 115 115 -156 115 115 -180 123 123 -197 123 123 -205 131 131 -222 131 131 -238 131 131 -255 139 139 -255 148 148 -0 156 139 -16 156 131 -41 156 131 -57 148 131 -74 148 123 -98 148 123 -115 148 115 -148 148 115 -156 139 115 -180 139 123 -197 139 123 -205 148 131 -222 148 131 -238 148 131 -255 148 139 -255 156 148 -0 180 131 -16 172 123 -32 172 123 -57 172 123 -74 164 123 -98 164 115 -115 156 115 -139 156 115 -156 156 115 -180 156 123 -197 164 123 -205 156 131 -222 164 131 -238 164 131 -255 164 139 -255 172 148 -0 197 123 -16 189 123 -32 189 123 -57 189 123 -74 180 115 -98 180 115 -123 180 123 -139 180 123 -164 180 123 -180 180 123 -197 180 123 -205 172 131 -222 180 131 -238 180 131 -255 180 139 -255 180 148 -0 213 123 -16 213 123 -32 205 123 -57 205 115 -82 197 115 -106 197 123 -123 197 123 -139 197 123 -164 197 123 -180 197 123 -197 197 123 -205 189 131 -222 189 131 -238 189 131 -255 197 139 -255 197 148 -0 230 123 -16 230 123 -41 222 115 -65 213 115 -98 205 131 -115 205 123 -131 205 131 -148 205 131 -164 205 131 -180 205 131 -189 205 131 -205 205 131 -222 205 131 -238 205 131 -255 205 139 -255 205 148 -0 246 123 -16 246 115 -49 230 115 -82 222 123 -98 222 131 -115 222 131 -131 222 131 -148 222 131 -164 222 131 -180 222 131 -197 222 131 -205 222 131 -222 222 131 -238 222 131 -255 222 139 -255 222 148 -0 255 115 -32 246 115 -65 238 123 -82 238 123 -98 238 131 -115 238 131 -131 238 131 -148 238 131 -164 238 131 -180 238 131 -197 238 131 -205 238 131 -222 238 131 -238 238 131 -255 238 139 -255 230 148 -16 255 115 -49 255 123 -65 255 123 -82 255 131 -98 255 131 -123 255 131 -139 255 139 -156 255 139 -164 255 139 -180 255 139 -197 255 139 -213 255 139 -222 255 139 -238 255 139 -255 255 139 -255 246 148 -49 255 123 -65 255 131 -82 255 131 -98 255 139 -115 255 139 -131 255 139 -148 255 148 -156 255 148 -172 255 148 -180 255 148 -197 255 148 -213 255 148 -222 255 148 -238 255 148 -246 255 148 -255 255 148 diff --git a/graphics/misc/sunny_day/39.pal b/graphics/misc/sunny_day/39.pal deleted file mode 100644 index b98692692b..0000000000 --- a/graphics/misc/sunny_day/39.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 156 -16 0 156 -41 0 156 -65 0 156 -90 0 156 -115 0 156 -139 0 156 -156 0 156 -180 0 156 -197 0 156 -213 0 148 -230 0 148 -246 0 139 -255 0 139 -255 16 139 -255 49 148 -0 24 156 -16 16 156 -41 16 156 -65 16 156 -90 16 156 -106 16 156 -131 16 156 -156 16 156 -172 16 156 -189 16 148 -213 16 148 -230 16 139 -246 16 139 -246 32 139 -255 49 148 -255 65 148 -0 49 156 -16 41 156 -41 41 156 -57 41 156 -82 41 156 -106 41 156 -131 41 156 -156 41 156 -172 32 148 -189 32 148 -205 32 148 -222 41 139 -230 49 139 -238 65 148 -255 65 148 -255 82 148 -0 65 156 -16 65 156 -41 57 156 -57 57 148 -82 57 148 -106 57 148 -131 57 148 -148 57 148 -172 57 148 -189 57 139 -205 57 139 -213 65 139 -222 82 148 -238 82 148 -255 82 148 -255 98 148 -0 90 156 -16 90 156 -41 82 156 -57 82 148 -74 74 148 -98 74 148 -123 74 148 -148 74 148 -164 74 148 -180 74 139 -197 82 139 -205 98 148 -222 98 148 -238 98 148 -255 98 148 -255 115 156 -0 115 156 -16 106 156 -41 106 156 -57 106 148 -74 98 148 -98 98 148 -123 98 148 -148 98 148 -164 98 139 -180 98 139 -197 106 139 -205 115 148 -222 115 148 -238 115 148 -255 123 148 -255 131 156 -0 139 156 -16 131 156 -41 131 156 -57 131 148 -74 123 148 -98 123 148 -115 115 148 -148 115 148 -156 115 139 -180 123 139 -197 123 139 -205 131 148 -222 131 148 -238 131 148 -255 139 156 -255 148 156 -0 156 156 -16 156 156 -41 156 156 -57 148 148 -74 148 148 -98 148 148 -115 148 148 -139 131 131 -164 139 139 -180 139 139 -197 148 148 -205 148 148 -222 148 148 -238 148 148 -255 156 156 -255 164 164 -0 180 156 -16 172 148 -32 172 148 -57 172 148 -74 164 148 -98 164 139 -115 156 139 -139 164 139 -164 164 139 -180 164 139 -197 156 148 -205 164 148 -222 164 148 -238 164 148 -255 164 156 -255 172 164 -0 197 148 -16 189 148 -32 189 148 -57 189 139 -74 180 139 -98 180 139 -123 180 139 -139 180 139 -164 180 139 -180 180 139 -197 172 148 -205 180 148 -222 180 148 -238 180 148 -255 180 156 -255 189 164 -0 213 148 -16 213 139 -32 205 139 -57 205 139 -82 197 139 -106 197 139 -123 197 139 -148 197 148 -164 197 148 -180 197 148 -197 197 148 -205 197 148 -222 189 148 -238 197 148 -255 197 156 -255 197 164 -0 230 139 -16 230 139 -41 222 139 -65 213 139 -98 205 139 -115 205 139 -131 205 148 -148 205 148 -164 205 148 -180 205 148 -197 205 148 -205 205 148 -222 205 148 -238 205 148 -255 205 156 -255 213 164 -0 246 139 -16 246 139 -49 230 139 -82 222 139 -98 222 139 -115 222 148 -131 222 148 -148 222 148 -164 222 148 -180 222 148 -197 222 148 -205 222 148 -222 222 148 -238 222 148 -255 222 156 -255 222 164 -0 255 139 -32 246 139 -65 238 139 -82 238 139 -98 238 139 -115 238 148 -131 238 148 -148 238 148 -164 238 148 -180 238 148 -197 238 148 -205 238 148 -222 238 148 -238 238 148 -255 238 156 -255 238 164 -16 255 139 -49 255 139 -65 255 139 -82 255 139 -98 255 148 -123 255 148 -139 255 148 -156 255 156 -172 255 156 -180 255 156 -197 255 156 -213 255 156 -222 255 156 -238 255 156 -255 255 156 -255 246 164 -49 255 139 -65 255 148 -82 255 148 -98 255 148 -115 255 156 -131 255 156 -148 255 156 -164 255 164 -180 255 164 -189 255 164 -197 255 164 -213 255 164 -222 255 164 -238 255 164 -246 255 164 -255 255 164 diff --git a/graphics/misc/sunny_day/4.pal b/graphics/misc/sunny_day/4.pal deleted file mode 100644 index 2c72d05af9..0000000000 --- a/graphics/misc/sunny_day/4.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 74 -24 8 74 -41 8 74 -57 8 74 -74 8 74 -90 8 74 -106 8 74 -139 0 82 -156 0 74 -172 0 74 -189 0 74 -205 0 74 -222 0 74 -238 0 74 -255 0 74 -255 24 90 -8 24 74 -24 24 74 -41 24 74 -57 24 74 -74 24 74 -90 24 74 -115 16 82 -131 16 74 -156 16 74 -172 16 74 -189 16 74 -205 16 74 -222 16 74 -238 16 74 -246 32 82 -255 41 90 -8 41 74 -24 41 74 -41 41 74 -57 41 74 -74 41 74 -98 41 82 -115 41 74 -131 41 74 -148 32 74 -172 32 74 -189 32 74 -205 32 74 -222 32 74 -230 49 82 -246 49 82 -255 57 90 -8 57 74 -24 57 74 -41 57 74 -57 57 74 -74 57 74 -98 57 74 -115 57 74 -131 57 74 -148 57 74 -164 57 74 -189 49 74 -205 57 74 -213 65 82 -230 65 82 -246 65 90 -255 74 90 -8 74 74 -24 74 74 -41 74 74 -57 74 74 -74 74 74 -98 74 74 -115 74 74 -131 74 74 -148 74 74 -164 74 74 -180 74 74 -197 82 82 -213 82 82 -230 82 82 -246 82 82 -255 90 90 -8 90 74 -24 90 74 -41 98 74 -57 98 74 -74 98 74 -98 98 74 -115 90 74 -131 90 74 -148 90 74 -164 90 74 -180 90 74 -197 98 82 -213 98 82 -230 98 82 -246 98 82 -255 106 90 -8 106 74 -16 115 74 -41 115 74 -57 115 74 -74 115 74 -90 115 74 -115 115 74 -131 115 74 -148 115 74 -164 106 74 -180 106 74 -197 115 82 -213 115 82 -230 115 82 -246 115 82 -255 123 90 -0 139 74 -16 131 74 -41 131 74 -57 131 74 -74 131 74 -90 131 74 -115 131 74 -131 131 74 -148 131 74 -164 131 74 -180 131 74 -197 131 82 -213 131 82 -230 131 82 -246 131 82 -255 139 90 -0 156 74 -16 156 74 -32 148 74 -57 148 74 -74 148 74 -90 148 74 -115 148 74 -131 148 74 -148 148 74 -164 148 74 -180 148 74 -197 148 82 -213 148 82 -230 148 82 -246 148 82 -255 148 90 -0 172 74 -16 172 74 -32 172 74 -57 164 74 -74 164 74 -90 164 74 -106 164 74 -131 164 74 -148 164 74 -164 164 74 -180 164 74 -197 164 82 -213 164 82 -230 164 82 -246 164 82 -255 164 90 -0 189 74 -16 189 74 -32 189 74 -49 189 74 -74 180 74 -90 180 74 -106 180 74 -131 180 74 -148 180 74 -164 180 74 -180 180 74 -197 180 82 -213 180 82 -230 180 82 -246 180 82 -255 180 90 -0 205 74 -16 205 65 -32 205 74 -57 205 74 -82 197 82 -98 197 82 -115 197 82 -131 197 82 -148 197 82 -164 197 82 -180 197 82 -197 197 82 -213 197 82 -230 197 82 -246 197 82 -255 197 90 -0 222 65 -16 222 74 -32 222 65 -65 213 82 -82 213 82 -98 213 82 -115 213 82 -131 213 82 -148 213 82 -164 213 82 -180 213 82 -197 213 82 -213 213 82 -230 213 82 -246 213 82 -255 213 90 -0 238 74 -16 238 74 -49 230 82 -65 230 82 -82 230 82 -98 230 82 -123 230 82 -131 230 82 -148 230 82 -172 230 82 -180 230 82 -197 230 82 -213 230 82 -230 230 82 -246 230 82 -255 222 90 -0 255 74 -32 246 82 -49 246 82 -65 246 82 -82 246 82 -98 246 82 -115 246 82 -131 246 82 -148 246 82 -164 246 82 -180 246 82 -197 246 82 -213 246 82 -230 246 82 -246 246 82 -255 238 90 -24 255 82 -41 255 82 -57 255 90 -74 255 90 -90 255 90 -106 255 90 -123 255 90 -139 255 90 -156 255 90 -172 255 90 -180 255 90 -197 255 90 -213 255 90 -230 255 90 -246 255 90 -255 255 90 diff --git a/graphics/misc/sunny_day/40.pal b/graphics/misc/sunny_day/40.pal deleted file mode 100644 index 68c85cefd2..0000000000 --- a/graphics/misc/sunny_day/40.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 180 -16 0 180 -41 0 180 -65 0 180 -90 0 180 -106 0 180 -131 0 180 -156 0 180 -180 0 180 -197 0 172 -213 0 172 -230 0 164 -246 0 164 -255 0 156 -255 16 156 -255 49 156 -0 24 180 -16 16 172 -41 16 172 -65 16 172 -82 16 172 -106 16 172 -123 16 172 -148 16 172 -172 16 172 -189 16 172 -213 16 172 -230 16 164 -246 16 164 -246 32 156 -255 49 164 -255 65 164 -0 41 180 -16 41 172 -32 32 172 -57 32 172 -82 32 172 -106 32 172 -123 32 172 -148 32 172 -172 32 172 -189 32 172 -205 32 164 -222 41 164 -230 49 156 -238 65 164 -255 65 164 -255 82 164 -0 65 180 -16 65 172 -32 57 172 -57 57 172 -74 57 172 -98 57 172 -123 57 172 -148 57 172 -172 57 172 -189 57 164 -205 57 164 -213 65 156 -222 82 164 -238 82 164 -255 82 164 -255 98 164 -0 90 180 -16 82 172 -32 82 172 -57 82 172 -74 74 164 -98 74 164 -123 74 164 -148 74 164 -164 74 164 -180 74 164 -197 82 156 -205 98 164 -222 98 164 -238 98 164 -255 98 164 -255 115 164 -0 115 180 -16 106 172 -32 106 172 -57 98 172 -74 98 164 -98 98 164 -115 98 164 -139 98 164 -164 98 164 -180 98 156 -197 106 164 -205 115 164 -222 115 164 -238 115 164 -255 123 164 -255 131 172 -0 131 180 -16 131 172 -32 123 172 -57 123 172 -74 123 164 -98 115 164 -115 115 156 -139 115 156 -156 115 156 -180 123 164 -197 123 164 -205 131 164 -222 131 164 -238 131 164 -255 139 164 -255 148 172 -0 156 180 -16 156 172 -32 148 172 -57 148 172 -74 148 164 -98 139 164 -115 139 156 -139 139 164 -164 139 164 -180 139 164 -197 148 164 -205 148 164 -222 148 164 -238 148 164 -255 156 172 -255 164 180 -0 180 180 -16 172 172 -32 172 172 -57 172 172 -74 164 164 -98 164 164 -115 156 156 -139 164 164 -164 156 156 -180 156 156 -197 164 164 -213 164 164 -222 164 164 -238 164 164 -255 172 172 -255 189 189 -0 197 172 -16 189 172 -32 189 164 -57 189 164 -74 180 164 -98 180 156 -123 180 156 -139 180 164 -156 180 156 -180 180 156 -197 180 164 -213 180 164 -222 180 164 -238 180 164 -255 180 172 -255 197 189 -0 213 164 -16 213 164 -32 205 164 -57 205 156 -82 197 156 -106 197 156 -123 197 164 -148 197 156 -164 197 164 -180 197 164 -197 197 164 -213 197 164 -222 197 164 -238 197 164 -255 197 172 -255 213 189 -0 230 164 -16 230 164 -41 222 156 -65 213 156 -98 205 156 -115 205 164 -131 205 156 -148 205 164 -164 213 164 -180 213 164 -197 213 164 -213 213 164 -222 205 164 -238 205 164 -255 213 172 -255 222 189 -0 246 156 -16 246 156 -49 230 156 -82 222 156 -98 222 164 -115 222 156 -131 222 164 -148 222 164 -164 222 164 -180 222 164 -197 222 164 -205 222 164 -222 222 164 -238 222 164 -255 222 172 -255 230 189 -0 255 156 -32 246 156 -65 238 156 -82 238 164 -98 238 156 -115 238 164 -131 238 164 -148 238 164 -164 238 164 -180 238 164 -197 238 164 -213 238 164 -222 238 164 -238 238 164 -255 238 172 -255 238 189 -16 255 156 -49 255 156 -65 255 164 -82 255 164 -98 255 156 -123 255 164 -139 255 164 -156 255 164 -172 255 172 -180 255 172 -197 255 172 -213 255 172 -222 255 172 -238 255 172 -255 255 172 -255 246 189 -49 255 156 -65 255 164 -82 255 156 -98 255 164 -115 255 164 -131 255 164 -148 255 172 -164 255 172 -189 255 189 -205 255 189 -213 255 189 -222 255 189 -230 255 189 -238 255 189 -246 255 189 -255 255 189 diff --git a/graphics/misc/sunny_day/41.pal b/graphics/misc/sunny_day/41.pal deleted file mode 100644 index 121a39ad3c..0000000000 --- a/graphics/misc/sunny_day/41.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 197 -16 0 197 -41 0 197 -57 0 197 -82 0 197 -106 0 197 -123 0 197 -148 0 197 -172 0 197 -197 0 197 -213 0 189 -230 0 189 -246 0 180 -255 0 180 -255 16 172 -255 49 172 -0 16 197 -16 16 189 -41 16 189 -57 16 189 -82 16 189 -106 16 189 -123 16 189 -148 16 189 -172 16 189 -189 16 189 -213 16 189 -230 16 189 -246 16 180 -246 32 172 -255 49 172 -255 65 180 -0 41 197 -16 41 189 -32 32 189 -57 32 189 -82 32 189 -98 32 189 -123 32 189 -148 32 189 -164 32 189 -189 32 189 -205 32 189 -222 41 180 -230 49 172 -238 65 172 -255 65 172 -255 82 180 -0 65 197 -16 57 189 -32 57 189 -57 57 189 -74 57 189 -98 57 189 -123 57 189 -139 57 189 -164 57 189 -189 57 189 -205 57 180 -213 65 172 -222 82 172 -238 82 172 -255 82 180 -255 98 180 -0 82 197 -16 82 189 -32 82 189 -57 74 189 -74 74 180 -98 74 180 -115 74 180 -139 74 180 -164 74 180 -180 74 180 -197 82 172 -205 98 172 -222 98 180 -238 98 180 -255 98 180 -255 115 180 -0 106 197 -16 106 189 -32 98 189 -57 98 189 -74 98 180 -98 98 180 -115 98 180 -139 98 180 -156 98 180 -180 98 180 -197 106 180 -205 115 172 -222 115 180 -238 115 180 -255 123 180 -255 131 180 -0 131 197 -16 131 189 -32 123 189 -57 123 189 -74 123 180 -98 115 180 -123 123 180 -139 123 180 -156 123 180 -180 123 180 -197 123 180 -205 131 180 -222 131 180 -238 131 180 -255 139 180 -255 148 180 -0 156 197 -16 148 189 -32 148 189 -57 139 189 -74 139 180 -98 139 180 -123 139 180 -139 139 180 -164 139 180 -180 139 180 -197 148 180 -205 148 180 -222 148 180 -238 148 180 -255 156 180 -255 164 189 -0 172 197 -16 172 189 -32 172 189 -57 164 189 -74 164 180 -98 156 180 -123 164 180 -139 164 180 -156 156 180 -180 156 180 -197 164 180 -213 164 180 -222 164 180 -238 164 180 -255 172 180 -255 189 205 -0 197 197 -16 189 189 -32 189 189 -57 189 189 -74 180 180 -98 180 180 -123 180 180 -139 180 180 -156 180 180 -180 172 172 -197 172 172 -213 180 180 -222 180 180 -238 180 180 -255 197 197 -255 205 205 -0 213 189 -16 213 189 -32 205 189 -57 205 180 -82 197 172 -106 197 172 -123 197 180 -148 197 172 -164 197 180 -172 197 172 -197 197 172 -213 197 180 -222 197 180 -238 197 180 -255 205 197 -255 213 205 -0 230 180 -16 230 180 -41 222 180 -65 213 172 -98 205 172 -115 205 172 -131 205 172 -148 205 180 -164 213 180 -180 213 180 -197 213 180 -213 213 180 -222 205 180 -238 213 180 -255 222 197 -255 222 205 -0 246 180 -16 246 180 -49 230 172 -82 222 172 -98 222 172 -115 222 172 -131 222 180 -148 222 180 -164 222 180 -180 222 180 -197 222 180 -213 222 180 -222 222 180 -238 222 180 -255 230 197 -255 230 205 -0 255 180 -32 246 172 -65 238 172 -82 238 172 -98 238 172 -115 238 180 -131 238 180 -148 238 180 -164 238 180 -180 238 180 -197 238 180 -213 238 180 -222 238 180 -238 238 180 -255 238 197 -255 238 205 -16 255 172 -49 255 172 -65 255 172 -82 255 172 -98 255 180 -123 255 180 -139 255 180 -156 255 180 -172 255 180 -197 255 197 -205 255 197 -222 255 197 -230 255 197 -238 255 197 -255 255 197 -255 246 205 -49 255 172 -65 255 172 -82 255 172 -98 255 180 -115 255 180 -131 255 180 -148 255 180 -164 255 189 -189 255 197 -205 255 205 -213 255 205 -222 255 205 -230 255 205 -238 255 205 -246 255 205 -255 255 205 diff --git a/graphics/misc/sunny_day/42.pal b/graphics/misc/sunny_day/42.pal deleted file mode 100644 index 534316abf6..0000000000 --- a/graphics/misc/sunny_day/42.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 213 -16 0 213 -32 0 213 -57 0 213 -82 0 213 -106 0 213 -123 0 213 -148 0 213 -164 0 213 -189 0 213 -213 0 213 -230 0 213 -246 0 205 -255 0 197 -255 16 189 -255 49 189 -0 16 213 -16 16 213 -32 16 213 -57 16 213 -74 16 213 -98 16 213 -123 16 213 -139 16 213 -164 16 213 -189 16 213 -213 16 213 -230 16 205 -246 16 205 -246 32 189 -255 49 197 -255 65 189 -0 41 213 -16 32 213 -32 32 205 -57 32 205 -74 32 205 -98 32 205 -123 32 205 -139 32 205 -164 32 205 -189 32 205 -205 32 205 -222 41 205 -230 49 189 -238 65 189 -255 65 189 -255 82 189 -0 57 213 -16 57 213 -32 57 205 -57 57 205 -74 57 205 -98 57 205 -115 57 205 -139 57 205 -156 57 205 -180 57 205 -205 57 205 -213 65 197 -222 82 189 -238 82 189 -255 82 189 -255 98 189 -0 82 213 -16 82 213 -32 74 205 -57 74 205 -82 82 197 -98 82 197 -115 82 197 -139 82 197 -156 82 197 -172 82 197 -197 82 197 -205 98 197 -222 98 189 -238 98 189 -255 98 189 -255 115 197 -0 106 213 -16 106 213 -32 98 205 -57 98 205 -82 98 197 -106 106 197 -123 106 197 -139 106 197 -156 106 197 -172 106 197 -197 106 197 -205 115 189 -222 115 189 -238 115 197 -255 123 197 -255 131 197 -0 123 213 -16 123 213 -32 123 205 -57 123 205 -82 123 197 -106 123 197 -123 123 197 -139 123 197 -164 123 197 -180 123 197 -197 123 197 -205 131 189 -222 131 197 -238 131 197 -255 139 197 -255 148 197 -0 148 213 -16 148 213 -32 148 205 -57 139 205 -82 139 197 -106 139 197 -123 139 197 -148 148 197 -156 148 197 -172 148 197 -197 148 197 -205 148 197 -222 148 197 -238 148 197 -255 156 197 -255 164 197 -0 172 213 -16 172 213 -32 164 205 -57 164 205 -82 156 197 -106 164 197 -123 164 197 -148 164 197 -164 164 197 -180 164 197 -197 164 197 -213 164 197 -222 164 197 -238 164 197 -255 172 197 -255 189 213 -0 189 213 -16 189 213 -32 189 205 -57 180 205 -82 172 197 -106 180 197 -123 180 197 -148 180 197 -164 180 197 -172 172 197 -197 172 197 -213 180 197 -222 180 197 -238 180 197 -255 197 205 -255 205 213 -0 213 213 -16 213 213 -32 205 205 -57 205 205 -82 197 197 -106 197 197 -123 197 197 -148 197 197 -164 197 197 -172 197 197 -197 189 189 -213 197 197 -230 197 197 -238 205 205 -255 213 213 -255 222 222 -0 230 205 -16 230 205 -41 222 197 -65 213 189 -98 205 189 -115 205 189 -131 205 189 -148 205 197 -164 213 197 -180 213 197 -197 213 197 -213 213 197 -230 213 197 -238 222 205 -255 222 213 -255 230 222 -0 246 197 -16 246 197 -49 230 189 -82 222 189 -98 222 189 -115 222 189 -131 222 189 -148 222 189 -164 222 197 -180 222 197 -197 230 197 -213 230 197 -230 230 197 -238 230 205 -255 230 213 -255 238 222 -0 255 197 -32 246 189 -65 238 189 -82 238 189 -98 238 189 -115 238 189 -131 238 189 -148 238 197 -164 238 197 -180 238 197 -205 238 205 -222 238 205 -230 238 205 -238 238 205 -255 246 213 -255 246 222 -16 255 189 -49 255 189 -65 255 189 -82 255 189 -98 255 189 -123 255 189 -139 255 197 -156 255 197 -172 255 197 -197 255 205 -213 255 213 -222 255 213 -230 255 213 -246 255 213 -255 255 213 -255 255 222 -49 255 180 -65 255 189 -82 255 189 -98 255 189 -115 255 189 -131 255 197 -148 255 197 -164 255 197 -189 255 213 -205 255 213 -222 255 222 -230 255 222 -238 255 222 -246 255 222 -255 255 222 -255 255 222 diff --git a/graphics/misc/sunny_day/43.pal b/graphics/misc/sunny_day/43.pal deleted file mode 100644 index 8fc1e0fb45..0000000000 --- a/graphics/misc/sunny_day/43.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 230 -16 0 230 -32 0 230 -57 0 230 -74 0 230 -98 0 230 -123 0 230 -139 0 230 -164 0 230 -180 0 230 -205 0 230 -230 0 230 -246 0 230 -255 0 222 -255 16 213 -255 49 205 -0 16 230 -16 16 230 -32 16 230 -49 16 230 -74 16 230 -98 16 230 -123 16 230 -139 16 230 -164 16 230 -180 16 230 -205 16 230 -230 16 230 -246 16 222 -246 32 213 -255 49 205 -255 65 205 -0 41 230 -16 32 230 -41 41 222 -57 41 222 -74 41 222 -98 41 222 -115 41 222 -139 41 222 -156 41 222 -180 41 222 -197 41 222 -222 41 222 -230 49 213 -238 65 205 -255 65 205 -255 82 205 -0 65 230 -16 57 230 -41 57 222 -65 65 213 -82 65 213 -98 65 213 -115 65 213 -139 65 213 -156 65 213 -172 65 213 -189 65 213 -213 65 213 -222 82 213 -238 82 205 -255 82 205 -255 98 205 -0 82 230 -16 74 230 -41 82 222 -65 82 213 -98 98 205 -115 98 205 -131 98 205 -139 98 205 -156 98 205 -172 98 205 -189 98 205 -205 98 205 -222 98 205 -238 98 205 -255 98 205 -255 115 205 -0 106 230 -16 98 230 -41 98 222 -65 98 213 -98 115 205 -115 115 205 -123 115 205 -139 115 205 -164 115 205 -172 115 205 -189 115 205 -205 115 205 -222 115 213 -238 115 205 -255 123 205 -255 131 205 -0 123 230 -16 123 230 -41 123 222 -65 123 213 -98 131 205 -115 131 205 -131 131 205 -148 131 205 -156 131 205 -172 131 205 -189 131 205 -205 131 205 -222 131 205 -238 131 205 -255 139 213 -255 148 213 -0 148 230 -16 139 230 -41 139 222 -65 139 213 -98 148 205 -115 148 205 -131 148 205 -148 148 205 -164 148 205 -180 148 205 -197 148 205 -205 148 205 -222 148 205 -238 148 205 -255 156 213 -255 164 213 -0 164 230 -16 164 230 -41 164 222 -65 156 213 -98 164 205 -115 164 205 -131 164 205 -148 164 205 -164 164 213 -180 164 213 -197 164 213 -213 164 213 -222 164 205 -238 164 213 -255 172 213 -255 189 222 -0 189 230 -16 189 230 -41 180 222 -65 172 213 -98 172 205 -115 172 205 -131 180 205 -148 180 205 -164 180 213 -180 180 213 -197 180 213 -213 180 213 -222 180 213 -238 180 213 -255 197 222 -255 205 222 -0 213 230 -16 205 230 -41 205 222 -65 197 213 -98 197 205 -115 189 205 -131 189 205 -148 197 205 -164 197 213 -180 197 213 -197 197 213 -213 197 213 -230 197 213 -238 205 222 -255 213 222 -255 222 230 -0 230 230 -16 230 230 -41 222 222 -65 213 213 -98 205 205 -115 205 205 -131 205 205 -148 205 205 -164 213 213 -180 213 213 -197 213 213 -213 213 213 -230 222 222 -246 222 222 -255 230 230 -255 238 238 -0 246 222 -16 246 222 -49 230 205 -82 222 205 -98 222 205 -115 222 205 -131 222 205 -148 222 205 -164 222 205 -180 222 205 -197 230 213 -222 230 222 -230 230 222 -246 230 222 -255 238 230 -255 246 238 -0 255 213 -32 246 205 -65 238 205 -82 238 205 -98 238 205 -115 238 205 -131 238 205 -148 238 205 -164 238 205 -180 238 213 -205 238 222 -222 246 222 -230 246 222 -246 246 222 -255 246 230 -255 246 238 -16 255 205 -49 255 205 -65 255 205 -82 255 205 -98 255 205 -123 255 205 -139 255 205 -156 255 205 -172 255 213 -197 255 222 -213 255 222 -230 255 230 -238 255 230 -246 255 230 -255 255 230 -255 255 238 -49 255 197 -65 255 197 -82 255 205 -98 255 205 -115 255 205 -131 255 205 -148 255 205 -164 255 213 -189 255 222 -205 255 222 -222 255 230 -238 255 238 -246 255 238 -246 255 238 -255 255 238 -255 255 238 diff --git a/graphics/misc/sunny_day/44.pal b/graphics/misc/sunny_day/44.pal deleted file mode 100644 index 3ee3d99703..0000000000 --- a/graphics/misc/sunny_day/44.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 246 -16 0 246 -32 0 246 -57 0 246 -74 0 246 -98 0 246 -123 0 246 -139 0 246 -156 0 246 -180 0 246 -197 0 246 -222 0 246 -246 0 246 -255 0 238 -255 16 230 -255 49 213 -0 16 246 -16 16 246 -32 16 246 -57 16 246 -74 16 246 -98 16 246 -115 16 246 -139 16 246 -156 16 246 -180 16 246 -197 16 246 -222 16 246 -246 16 246 -246 32 230 -255 49 222 -255 65 222 -0 41 246 -16 41 246 -49 49 230 -65 49 230 -82 49 230 -98 49 230 -115 49 230 -139 49 230 -156 49 230 -172 49 230 -189 49 230 -205 49 230 -230 49 230 -238 65 222 -255 65 222 -255 82 213 -0 57 246 -16 57 246 -49 65 230 -82 82 222 -90 82 222 -115 82 222 -123 82 222 -139 82 222 -156 82 222 -172 82 222 -189 82 222 -205 82 222 -222 82 222 -238 82 222 -255 82 222 -255 98 222 -0 82 246 -16 82 246 -49 82 230 -82 98 222 -98 98 222 -115 98 222 -131 98 222 -139 98 222 -164 98 222 -172 98 222 -189 98 222 -205 98 222 -222 98 222 -238 98 222 -255 98 222 -255 115 222 -0 98 246 -16 98 246 -49 98 230 -82 115 222 -98 115 222 -115 115 222 -131 115 222 -148 115 222 -156 115 222 -172 115 222 -189 115 222 -205 115 222 -222 115 222 -238 115 222 -255 123 222 -255 131 222 -0 123 246 -16 123 246 -49 123 230 -82 131 222 -98 131 222 -115 131 222 -131 131 222 -148 131 222 -164 131 222 -180 131 222 -189 131 222 -205 131 222 -222 131 222 -238 131 222 -255 139 222 -255 148 222 -0 139 246 -16 139 246 -49 139 230 -82 148 222 -98 148 222 -115 148 222 -131 148 222 -148 148 222 -164 148 222 -180 148 222 -189 148 222 -205 148 222 -222 148 222 -238 148 222 -255 156 222 -255 164 222 -0 164 246 -16 164 246 -49 156 230 -82 164 222 -98 164 222 -115 164 222 -131 164 222 -148 164 222 -164 164 222 -180 164 222 -197 164 222 -205 164 222 -222 164 222 -238 164 222 -255 172 222 -255 189 230 -0 180 246 -16 180 246 -49 172 230 -82 172 222 -98 180 222 -115 180 222 -131 180 222 -148 180 222 -164 180 222 -180 180 222 -197 180 222 -205 180 222 -222 180 222 -238 180 222 -255 197 230 -255 205 230 -0 205 246 -16 205 246 -49 189 230 -82 189 222 -98 189 222 -115 189 222 -131 197 222 -148 197 222 -164 197 222 -180 197 222 -197 197 230 -213 197 230 -230 197 230 -238 205 230 -255 213 230 -255 222 238 -0 230 246 -16 222 246 -49 213 230 -82 213 222 -98 205 222 -115 213 222 -131 205 222 -148 205 222 -164 205 222 -180 213 222 -197 213 230 -222 222 230 -230 222 230 -246 222 230 -255 230 238 -255 238 246 -0 246 246 -16 246 246 -49 230 230 -82 222 222 -98 222 222 -115 222 222 -131 222 222 -148 222 222 -164 222 222 -180 222 222 -197 230 230 -222 230 230 -238 230 230 -246 238 238 -255 246 246 -255 255 255 -0 255 238 -32 246 222 -65 238 222 -82 238 222 -98 238 222 -115 238 222 -131 238 222 -148 238 222 -164 238 222 -180 238 222 -205 238 230 -222 246 230 -238 246 238 -246 246 238 -255 246 246 -255 255 255 -16 255 222 -49 255 222 -65 255 222 -82 255 222 -98 255 222 -123 255 222 -139 255 222 -156 255 222 -172 255 222 -197 255 230 -213 255 230 -230 255 238 -246 255 246 -246 255 246 -255 255 246 -255 255 255 -49 255 213 -65 255 213 -82 255 213 -98 255 222 -115 255 213 -131 255 222 -148 255 222 -164 255 222 -189 255 230 -205 255 230 -222 255 238 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/45.pal b/graphics/misc/sunny_day/45.pal deleted file mode 100644 index f63f8a7b47..0000000000 --- a/graphics/misc/sunny_day/45.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 255 -16 0 255 -41 0 255 -57 0 255 -82 0 255 -98 0 255 -115 0 255 -139 0 255 -156 0 255 -180 0 255 -197 0 255 -213 0 255 -238 0 255 -255 0 255 -255 16 246 -255 49 230 -0 24 255 -32 32 246 -41 32 246 -65 32 246 -82 32 246 -98 32 246 -115 32 246 -139 32 246 -156 32 246 -172 32 246 -189 32 246 -205 32 246 -222 32 246 -246 32 246 -255 49 238 -255 65 230 -0 41 255 -32 49 246 -65 65 238 -82 65 238 -90 65 238 -115 65 238 -123 65 238 -139 65 238 -156 65 238 -172 65 238 -189 65 238 -205 65 238 -222 65 238 -238 65 238 -255 65 238 -255 82 230 -0 57 255 -32 65 246 -65 82 238 -82 82 238 -98 82 238 -115 82 238 -123 82 238 -139 82 238 -164 82 238 -172 82 238 -189 82 238 -205 82 238 -222 82 238 -238 82 238 -255 82 238 -255 98 230 -0 82 255 -32 82 246 -65 98 238 -82 98 238 -98 98 238 -115 98 238 -131 98 238 -139 98 238 -156 98 238 -172 98 238 -189 98 238 -205 98 238 -222 98 238 -238 98 238 -255 98 238 -255 115 230 -0 98 255 -32 98 246 -65 115 238 -82 115 238 -98 115 238 -115 115 238 -131 115 238 -148 115 238 -164 115 238 -180 115 238 -189 115 238 -205 115 238 -222 115 238 -238 115 238 -255 123 238 -255 131 230 -0 123 255 -32 123 246 -65 131 238 -82 131 238 -98 131 238 -115 131 238 -131 131 238 -148 131 238 -164 131 238 -180 131 238 -189 131 238 -205 131 238 -222 131 238 -238 131 238 -255 139 238 -255 148 238 -0 139 255 -32 139 246 -65 148 238 -82 148 238 -98 148 238 -115 148 238 -131 148 238 -148 148 238 -164 148 238 -180 148 238 -197 148 238 -205 148 238 -222 148 238 -238 148 238 -255 156 238 -255 164 238 -0 156 255 -32 156 246 -65 164 238 -82 164 238 -98 164 238 -115 164 238 -131 164 238 -148 164 238 -164 164 238 -180 164 238 -197 164 238 -205 164 238 -222 164 238 -238 164 238 -255 172 238 -255 189 238 -0 180 255 -32 172 246 -65 172 238 -82 172 238 -98 180 238 -115 180 238 -131 180 238 -148 180 238 -164 180 238 -180 180 238 -197 180 238 -213 180 238 -222 180 238 -238 180 238 -255 197 238 -255 205 238 -0 197 255 -32 189 246 -65 189 238 -82 189 238 -98 189 238 -115 197 238 -131 197 238 -148 197 238 -164 197 238 -180 197 238 -205 205 238 -222 205 238 -230 205 238 -238 205 238 -255 213 246 -255 222 246 -0 222 255 -32 213 246 -65 205 238 -82 205 238 -98 205 238 -115 205 238 -131 205 238 -148 205 238 -164 213 238 -180 213 238 -205 222 238 -222 222 246 -230 222 246 -246 222 246 -255 230 246 -255 238 246 -0 238 255 -32 230 246 -65 222 238 -82 222 238 -98 222 238 -115 222 238 -131 222 238 -148 222 238 -164 222 238 -180 222 238 -205 230 238 -222 230 246 -238 238 246 -246 238 246 -255 246 246 -255 255 255 -0 255 255 -32 246 246 -65 238 238 -82 238 238 -98 238 238 -115 238 238 -131 238 238 -148 238 238 -164 238 238 -180 238 238 -205 238 238 -222 246 246 -238 246 246 -255 246 246 -255 255 255 -255 255 255 -16 255 238 -49 255 238 -65 255 238 -82 255 238 -98 255 238 -123 255 238 -139 255 238 -156 255 238 -172 255 238 -197 255 238 -213 255 246 -230 255 246 -246 255 246 -255 255 255 -255 255 255 -255 255 255 -49 255 230 -65 255 230 -82 255 230 -98 255 230 -115 255 230 -131 255 230 -148 255 230 -164 255 238 -189 255 238 -205 255 238 -222 255 246 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/46.pal b/graphics/misc/sunny_day/46.pal deleted file mode 100644 index 856a0743ae..0000000000 --- a/graphics/misc/sunny_day/46.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -16 16 255 -32 16 255 -49 16 255 -65 16 255 -90 16 255 -98 16 255 -115 16 255 -139 16 255 -156 16 255 -172 16 255 -189 16 255 -205 16 255 -222 16 255 -238 16 255 -255 16 255 -255 49 246 -16 41 255 -49 49 255 -65 49 255 -82 49 255 -90 49 255 -115 49 255 -123 49 255 -139 49 255 -156 49 255 -172 49 255 -189 49 255 -205 49 255 -222 49 255 -238 49 255 -255 49 255 -255 65 246 -16 57 255 -49 65 255 -65 65 255 -82 65 255 -98 65 255 -115 65 255 -123 65 255 -139 65 255 -164 65 255 -172 65 255 -189 65 255 -205 65 255 -222 65 255 -238 65 255 -255 65 255 -255 82 246 -16 74 255 -49 82 255 -65 82 255 -82 82 255 -98 82 255 -115 82 255 -131 82 255 -139 82 255 -164 82 255 -172 82 255 -189 82 255 -205 82 255 -222 82 255 -238 82 255 -255 82 255 -255 98 246 -16 90 255 -49 98 255 -65 98 255 -82 98 255 -98 98 255 -115 98 255 -131 98 255 -148 98 255 -156 98 255 -180 98 255 -189 98 255 -205 98 255 -222 98 255 -238 98 255 -255 98 255 -255 115 246 -16 106 255 -49 115 255 -65 115 255 -82 115 255 -98 115 255 -123 123 255 -131 123 255 -148 123 255 -164 123 255 -180 123 255 -189 123 255 -205 123 255 -222 123 255 -238 123 255 -255 123 255 -255 131 246 -16 123 255 -49 131 255 -65 131 255 -82 131 255 -98 131 255 -123 131 255 -139 139 255 -148 139 255 -164 139 255 -180 139 255 -197 139 255 -205 139 255 -222 139 255 -238 139 255 -255 139 255 -255 148 246 -16 139 255 -49 148 255 -65 148 255 -82 148 255 -98 148 255 -123 148 255 -139 156 255 -156 156 255 -164 156 255 -180 156 255 -197 156 255 -205 156 255 -222 156 255 -238 156 255 -255 156 255 -255 164 246 -16 156 255 -49 164 255 -65 164 255 -82 164 255 -98 164 255 -123 164 255 -139 164 255 -156 172 255 -172 172 255 -180 172 255 -197 172 255 -213 172 255 -222 172 255 -238 172 255 -255 172 255 -255 189 246 -16 172 255 -49 172 255 -65 172 255 -82 180 255 -98 180 255 -123 180 255 -139 180 255 -156 180 255 -172 180 255 -197 197 255 -205 197 255 -222 197 255 -230 197 255 -238 197 255 -255 197 255 -255 205 246 -16 189 255 -49 197 255 -65 189 255 -82 189 255 -98 189 255 -123 197 255 -139 197 255 -156 197 255 -172 197 255 -197 205 255 -213 213 255 -222 213 255 -230 213 255 -246 213 255 -255 213 255 -255 222 255 -16 213 255 -49 205 255 -65 205 255 -82 205 255 -98 205 255 -123 205 255 -139 213 255 -156 213 255 -172 213 255 -197 222 255 -213 222 255 -230 230 255 -238 230 255 -246 230 255 -255 230 255 -255 238 255 -16 230 255 -49 222 255 -65 222 255 -82 222 255 -98 222 255 -123 222 255 -139 222 255 -156 222 255 -172 222 255 -197 230 255 -213 230 255 -230 238 255 -246 246 255 -246 246 255 -255 246 255 -255 255 255 -16 246 255 -49 238 255 -65 238 255 -82 238 255 -98 238 255 -123 238 255 -139 238 255 -156 238 255 -172 238 255 -197 238 255 -213 246 255 -230 246 255 -246 246 255 -255 255 255 -255 255 255 -255 255 255 -16 255 255 -49 255 255 -65 255 255 -82 255 255 -98 255 255 -123 255 255 -139 255 255 -156 255 255 -172 255 255 -197 255 255 -213 255 255 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -49 255 238 -65 255 246 -82 255 246 -98 255 246 -115 255 246 -131 255 246 -148 255 246 -164 255 246 -189 255 246 -205 255 246 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/47.pal b/graphics/misc/sunny_day/47.pal deleted file mode 100644 index 1dfa69803a..0000000000 --- a/graphics/misc/sunny_day/47.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -49 49 255 -57 49 255 -74 49 255 -82 49 255 -98 49 255 -115 49 255 -123 49 255 -139 49 255 -156 49 255 -172 49 255 -180 49 255 -197 49 255 -213 49 255 -230 49 255 -238 49 255 -255 49 255 -49 57 255 -65 65 255 -74 65 255 -90 65 255 -98 65 255 -115 65 255 -131 65 255 -148 65 255 -164 65 255 -172 65 255 -189 65 255 -197 65 255 -213 65 255 -230 65 255 -246 65 255 -255 65 255 -49 74 255 -65 82 255 -82 82 255 -90 82 255 -106 82 255 -115 82 255 -131 82 255 -148 82 255 -156 82 255 -172 82 255 -189 82 255 -205 82 255 -213 82 255 -230 82 255 -246 82 255 -255 82 255 -49 90 255 -65 90 255 -82 90 255 -98 98 255 -106 98 255 -123 98 255 -139 98 255 -148 98 255 -164 98 255 -180 98 255 -189 98 255 -205 98 255 -222 98 255 -230 98 255 -246 98 255 -255 98 255 -49 98 255 -65 106 255 -82 106 255 -98 106 255 -115 115 255 -123 115 255 -139 115 255 -156 115 255 -164 115 255 -180 115 255 -189 115 255 -205 115 255 -213 115 255 -230 115 255 -246 115 255 -255 115 255 -49 115 255 -65 123 255 -82 123 255 -98 123 255 -115 131 255 -131 131 255 -139 131 255 -156 131 255 -164 131 255 -180 131 255 -197 131 255 -205 131 255 -222 131 255 -230 131 255 -246 131 255 -255 131 255 -49 131 255 -65 131 255 -82 139 255 -98 139 255 -115 139 255 -131 139 255 -148 148 255 -156 148 255 -172 148 255 -180 148 255 -197 148 255 -205 148 255 -222 148 255 -230 148 255 -246 148 255 -255 148 255 -49 148 255 -65 148 255 -82 148 255 -98 148 255 -115 156 255 -131 156 255 -148 156 255 -164 164 255 -172 164 255 -189 164 255 -197 164 255 -213 164 255 -222 164 255 -238 164 255 -246 164 255 -255 164 255 -49 156 255 -65 164 255 -82 164 255 -98 164 255 -115 164 255 -131 172 255 -148 172 255 -164 180 255 -189 189 255 -197 189 255 -213 189 255 -222 189 255 -230 189 255 -238 189 255 -246 189 255 -255 189 255 -49 172 255 -65 180 255 -82 180 255 -98 180 255 -115 180 255 -131 180 255 -148 180 255 -164 189 255 -189 205 255 -205 205 255 -213 205 255 -222 205 255 -230 205 255 -238 205 255 -246 205 255 -255 205 255 -49 189 255 -65 189 255 -82 189 255 -98 189 255 -115 197 255 -131 197 255 -148 197 255 -164 197 255 -189 213 255 -205 213 255 -222 222 255 -230 222 255 -238 222 255 -246 222 255 -255 222 255 -255 222 255 -49 205 255 -65 205 255 -82 205 255 -98 205 255 -115 205 255 -131 205 255 -148 213 255 -164 213 255 -189 222 255 -205 222 255 -222 230 255 -238 238 255 -246 238 255 -246 238 255 -255 238 255 -255 238 255 -49 213 255 -65 222 255 -82 213 255 -98 222 255 -115 222 255 -131 222 255 -148 222 255 -164 222 255 -189 230 255 -205 230 255 -222 238 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 230 255 -65 230 255 -82 230 255 -98 230 255 -115 230 255 -131 230 255 -148 238 255 -164 238 255 -189 238 255 -205 238 255 -222 246 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 246 255 -65 246 255 -82 246 255 -98 246 255 -115 246 255 -131 246 255 -148 246 255 -164 246 255 -189 246 255 -205 246 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 255 255 -65 255 255 -82 255 255 -98 255 255 -115 255 255 -131 255 255 -148 255 255 -164 255 255 -189 255 255 -205 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/48.pal b/graphics/misc/sunny_day/48.pal deleted file mode 100644 index 06eb9906fc..0000000000 --- a/graphics/misc/sunny_day/48.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 8 -24 8 8 -41 8 8 -57 8 8 -74 8 8 -90 8 8 -106 8 8 -172 0 0 -189 0 0 -205 0 0 -222 0 0 -238 0 0 -255 0 0 -255 8 8 -255 24 24 -255 57 57 -8 24 8 -24 24 8 -41 24 8 -57 24 8 -74 24 8 -90 24 8 -106 24 8 -172 16 0 -189 16 0 -205 16 0 -222 16 0 -238 16 0 -255 16 0 -255 24 8 -255 41 24 -255 65 57 -8 41 8 -24 41 8 -41 41 8 -57 41 8 -74 41 8 -90 41 8 -106 41 8 -172 49 0 -189 41 0 -205 41 0 -222 41 0 -238 32 0 -255 32 0 -255 49 8 -255 57 24 -255 82 57 -8 57 8 -24 57 8 -41 57 8 -57 57 8 -74 57 8 -90 57 8 -106 57 8 -172 65 0 -189 65 0 -205 65 0 -222 57 0 -238 57 0 -255 57 0 -255 65 8 -255 74 24 -255 90 57 -8 74 8 -24 74 8 -41 74 8 -57 74 8 -74 74 8 -90 74 8 -106 74 8 -172 98 0 -189 90 0 -205 90 0 -222 82 0 -238 82 0 -255 82 0 -255 82 8 -255 90 24 -255 106 57 -8 90 8 -24 90 8 -41 90 8 -57 90 8 -74 90 8 -90 90 8 -106 90 8 -172 123 0 -189 115 0 -205 115 0 -222 106 0 -238 106 0 -255 98 0 -255 98 8 -255 106 24 -255 123 57 -8 106 8 -24 106 8 -41 106 8 -57 106 8 -74 106 8 -90 106 8 -106 106 8 -172 148 0 -189 139 0 -205 131 0 -222 131 0 -238 123 0 -255 123 0 -255 123 8 -255 123 24 -255 131 57 -0 172 0 -24 172 0 -49 172 0 -74 172 0 -98 172 0 -123 172 0 -148 172 0 -172 172 0 -189 164 0 -205 156 0 -222 148 0 -238 148 0 -255 148 0 -255 139 8 -255 139 24 -255 148 57 -0 189 0 -24 189 0 -41 189 0 -74 189 0 -90 189 0 -115 189 0 -139 189 0 -164 189 0 -189 189 0 -205 180 0 -222 172 0 -238 172 0 -255 164 0 -255 156 8 -255 156 24 -255 164 57 -0 205 0 -16 205 0 -41 205 0 -65 205 0 -90 205 0 -115 205 0 -139 205 0 -164 205 0 -189 205 0 -205 205 0 -222 197 0 -238 189 0 -255 189 0 -255 180 8 -255 172 24 -255 172 57 -0 222 0 -16 222 0 -41 222 0 -65 222 0 -90 222 0 -106 222 0 -131 222 0 -156 222 0 -180 222 0 -197 222 0 -222 222 0 -238 213 0 -255 205 0 -255 197 8 -255 189 24 -255 189 57 -0 238 0 -16 238 0 -41 238 0 -65 238 0 -82 238 0 -106 238 0 -131 238 0 -148 238 0 -172 238 0 -197 238 0 -222 238 0 -238 238 0 -255 230 0 -255 213 8 -255 205 24 -255 197 57 -0 255 0 -16 255 0 -41 255 0 -57 255 0 -82 255 0 -106 255 0 -123 255 0 -148 255 0 -172 255 0 -189 255 0 -213 255 0 -238 255 0 -255 255 0 -255 238 8 -255 222 24 -255 213 57 -8 255 8 -32 255 8 -49 255 8 -65 255 8 -90 255 8 -106 255 8 -123 255 8 -148 255 8 -164 255 8 -180 255 8 -197 255 8 -222 255 8 -238 255 8 -255 255 8 -255 238 24 -255 230 57 -24 255 24 -49 255 24 -65 255 24 -82 255 24 -98 255 24 -115 255 24 -131 255 24 -139 255 24 -164 255 24 -180 255 24 -197 255 24 -213 255 24 -230 255 24 -246 255 24 -255 255 24 -255 238 57 -57 255 57 -65 255 57 -82 255 57 -98 255 57 -106 255 57 -123 255 57 -139 255 57 -148 255 57 -164 255 57 -180 255 57 -189 255 57 -205 255 57 -222 255 57 -230 255 57 -246 255 57 -255 255 57 diff --git a/graphics/misc/sunny_day/49.pal b/graphics/misc/sunny_day/49.pal deleted file mode 100644 index 0f477a389e..0000000000 --- a/graphics/misc/sunny_day/49.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 24 -24 8 24 -41 8 24 -57 8 24 -74 8 24 -90 8 24 -106 8 24 -172 0 24 -189 0 24 -205 0 16 -222 0 16 -238 0 16 -255 0 16 -255 8 32 -255 24 49 -255 57 65 -8 24 24 -24 24 24 -41 24 24 -57 24 24 -74 24 24 -90 24 24 -148 16 16 -164 16 16 -189 16 16 -205 16 16 -222 8 8 -246 8 8 -246 24 24 -246 41 41 -255 57 57 -255 74 74 -8 41 24 -24 41 24 -41 41 24 -57 41 24 -74 41 24 -90 41 24 -148 41 16 -164 41 16 -189 41 16 -205 41 16 -222 32 8 -246 32 8 -246 41 24 -246 49 41 -255 74 57 -255 82 74 -8 57 24 -24 57 24 -41 57 24 -57 57 24 -74 57 24 -90 57 24 -148 65 16 -164 65 16 -189 65 16 -205 65 16 -222 57 8 -246 49 8 -246 57 24 -246 65 41 -255 90 57 -255 98 74 -8 74 24 -24 74 24 -41 74 24 -57 74 24 -74 74 24 -90 74 24 -148 98 16 -164 90 16 -189 90 16 -205 82 16 -222 82 8 -246 74 8 -246 82 24 -246 90 41 -255 98 57 -255 106 74 -8 90 24 -24 90 24 -41 90 24 -57 90 24 -74 90 24 -90 90 24 -148 123 16 -164 115 16 -189 115 16 -205 106 16 -222 106 8 -246 98 8 -246 98 24 -246 106 41 -255 115 57 -255 123 74 -8 106 24 -16 148 16 -49 148 16 -74 148 16 -98 148 16 -123 148 16 -148 148 16 -164 139 16 -189 131 16 -205 131 16 -222 131 8 -246 123 8 -246 123 24 -246 123 41 -255 131 57 -255 139 74 -0 172 16 -16 164 16 -41 164 16 -65 164 16 -90 164 16 -115 164 16 -139 164 16 -164 164 16 -189 156 16 -205 156 16 -222 148 8 -246 148 8 -246 139 24 -246 139 41 -255 148 57 -255 148 74 -0 189 16 -16 189 16 -41 189 16 -65 189 16 -90 189 16 -115 189 16 -139 189 16 -164 189 16 -189 189 16 -205 180 16 -222 172 8 -246 172 8 -246 164 24 -246 156 41 -255 164 57 -255 164 74 -0 205 16 -16 205 16 -41 205 16 -65 205 16 -90 205 16 -106 205 16 -131 205 16 -156 205 16 -180 205 16 -205 205 16 -222 197 8 -246 189 8 -246 180 24 -246 172 41 -255 180 57 -255 180 74 -0 222 16 -8 222 8 -32 222 8 -57 222 8 -82 222 8 -106 222 8 -131 222 8 -156 222 8 -180 222 8 -205 222 8 -222 222 8 -246 213 8 -246 205 24 -246 197 41 -255 197 57 -255 189 74 -0 238 16 -8 246 8 -32 246 8 -57 246 8 -82 246 8 -106 246 8 -123 246 8 -148 246 8 -172 246 8 -197 246 8 -222 246 8 -246 246 8 -246 222 24 -246 213 41 -255 205 57 -255 205 74 -0 255 16 -24 246 24 -49 246 24 -65 246 24 -90 246 24 -106 246 24 -131 246 24 -148 246 24 -164 246 24 -189 246 24 -205 246 24 -230 246 24 -246 246 24 -246 230 41 -255 222 57 -255 222 74 -8 255 24 -41 246 41 -57 246 41 -74 246 41 -90 246 41 -106 246 41 -123 246 41 -139 246 41 -164 246 41 -180 246 41 -197 246 41 -213 246 41 -230 246 41 -246 246 41 -255 238 57 -255 230 74 -24 255 41 -57 255 57 -74 255 57 -90 255 57 -106 255 57 -123 255 57 -131 255 57 -148 255 57 -164 255 57 -180 255 57 -197 255 57 -213 255 57 -230 255 57 -246 255 57 -255 255 57 -255 246 74 -57 255 65 -74 255 74 -90 255 74 -98 255 74 -115 255 74 -131 255 74 -139 255 74 -156 255 74 -164 255 74 -180 255 74 -197 255 74 -205 255 74 -222 255 74 -230 255 74 -246 255 74 -255 255 74 diff --git a/graphics/misc/sunny_day/5.pal b/graphics/misc/sunny_day/5.pal deleted file mode 100644 index c275f5dc98..0000000000 --- a/graphics/misc/sunny_day/5.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 90 -24 8 90 -41 8 90 -57 8 90 -74 8 90 -90 8 90 -106 8 90 -139 0 98 -156 0 98 -172 0 98 -189 0 90 -205 0 98 -222 0 90 -238 0 90 -255 0 90 -255 24 106 -8 24 90 -24 24 90 -41 24 90 -57 24 90 -74 24 90 -90 24 90 -115 16 98 -131 16 98 -156 16 98 -172 16 90 -189 16 90 -205 16 90 -222 16 90 -238 16 90 -246 32 98 -255 41 106 -8 41 90 -24 41 90 -41 41 98 -57 41 98 -74 41 98 -98 41 98 -115 41 98 -131 41 98 -148 32 90 -172 32 90 -189 32 90 -205 32 90 -222 32 90 -230 49 106 -246 49 98 -255 57 106 -8 57 90 -24 57 90 -41 57 98 -57 57 98 -74 57 98 -98 57 98 -115 57 98 -131 57 90 -148 57 90 -164 57 90 -189 49 90 -205 57 90 -213 65 98 -230 65 98 -246 65 98 -255 74 106 -8 74 90 -24 74 90 -41 82 98 -57 74 98 -74 74 98 -98 74 98 -115 74 90 -131 74 90 -148 74 90 -164 74 90 -180 74 90 -197 82 98 -213 82 98 -230 82 98 -246 82 98 -255 90 106 -8 90 90 -24 90 90 -41 98 98 -57 98 98 -74 98 98 -90 90 90 -115 90 90 -131 90 90 -148 90 90 -164 90 90 -180 98 98 -197 98 98 -213 98 98 -230 98 98 -246 106 106 -255 106 106 -8 106 90 -16 115 98 -41 115 98 -57 115 90 -74 115 90 -90 115 90 -115 115 90 -131 115 90 -148 106 90 -164 106 90 -180 115 98 -197 115 98 -213 115 98 -230 115 98 -246 115 106 -255 123 106 -0 139 98 -16 131 98 -41 131 90 -57 131 90 -74 131 90 -90 131 90 -115 131 90 -131 131 90 -148 131 90 -164 131 90 -180 131 98 -197 131 98 -213 131 98 -230 131 98 -246 131 106 -255 139 106 -0 156 98 -16 156 98 -32 148 90 -57 148 90 -74 148 90 -90 148 90 -106 148 90 -131 148 90 -148 148 90 -164 148 90 -180 148 98 -197 148 98 -213 148 98 -230 148 98 -246 148 106 -255 148 106 -0 172 90 -16 172 90 -32 172 90 -57 164 90 -74 164 90 -90 164 90 -106 164 90 -131 164 90 -148 164 90 -164 164 90 -180 164 98 -197 164 98 -213 164 98 -230 164 98 -246 164 106 -255 164 106 -0 189 90 -16 189 90 -32 189 90 -49 189 90 -74 180 90 -98 180 98 -115 180 98 -131 180 98 -148 180 98 -164 180 98 -180 180 98 -197 180 98 -213 180 98 -230 180 98 -246 180 106 -255 180 106 -0 205 90 -16 205 90 -32 205 90 -57 205 90 -82 197 98 -98 197 98 -115 197 98 -131 197 98 -148 197 98 -164 197 98 -180 197 98 -197 197 98 -213 197 98 -230 197 98 -246 197 106 -255 197 106 -0 222 90 -16 222 90 -32 222 90 -65 213 98 -82 213 98 -98 213 98 -115 213 98 -139 213 98 -148 213 98 -164 213 98 -180 213 98 -197 213 98 -213 213 98 -230 213 98 -246 213 106 -255 213 106 -0 238 90 -16 238 90 -49 230 98 -65 230 98 -82 230 98 -98 230 98 -123 230 98 -131 230 98 -156 230 98 -164 230 98 -180 230 98 -197 230 98 -213 230 98 -230 230 98 -246 230 106 -255 230 106 -0 255 90 -32 246 98 -49 246 98 -65 246 98 -82 246 98 -106 246 106 -123 246 106 -139 246 106 -148 246 106 -172 246 106 -189 246 106 -197 246 106 -213 246 106 -230 246 106 -246 246 106 -255 238 106 -24 255 98 -41 255 106 -57 255 98 -74 255 106 -90 255 106 -106 255 106 -123 255 106 -139 255 106 -156 255 106 -172 255 106 -180 255 106 -197 255 106 -213 255 106 -230 255 106 -246 255 106 -255 255 106 diff --git a/graphics/misc/sunny_day/50.pal b/graphics/misc/sunny_day/50.pal deleted file mode 100644 index e162a20faf..0000000000 --- a/graphics/misc/sunny_day/50.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 41 -24 8 41 -41 8 41 -57 8 41 -74 8 41 -90 8 41 -106 8 41 -172 0 49 -189 0 41 -205 0 41 -222 0 41 -238 0 41 -255 0 41 -255 8 49 -255 24 65 -255 57 82 -8 24 41 -24 24 41 -41 24 41 -57 24 41 -74 24 41 -90 24 41 -148 16 49 -164 16 41 -189 16 41 -205 16 41 -222 8 32 -246 8 32 -246 24 49 -246 41 57 -255 57 74 -255 74 90 -8 41 41 -24 41 41 -41 41 41 -57 41 41 -74 41 41 -123 41 41 -139 41 41 -164 41 41 -180 32 32 -205 32 32 -222 32 32 -230 41 41 -230 57 57 -238 74 74 -255 74 74 -255 90 90 -8 57 41 -24 57 41 -41 57 41 -57 57 41 -74 57 41 -123 65 41 -139 65 41 -164 57 41 -180 57 32 -205 57 32 -222 57 32 -230 65 41 -230 74 57 -238 90 74 -255 90 74 -255 98 90 -8 74 41 -24 74 41 -41 74 41 -57 74 41 -74 74 41 -123 98 41 -139 90 41 -164 90 41 -180 82 32 -205 82 32 -222 82 32 -230 82 41 -230 90 57 -238 98 74 -255 98 74 -255 115 90 -8 90 41 -24 90 41 -41 123 41 -74 123 41 -98 123 41 -123 123 41 -139 115 41 -164 115 41 -180 106 32 -205 106 32 -222 98 32 -230 98 41 -230 106 57 -238 115 74 -255 123 74 -255 123 90 -8 106 41 -16 148 41 -41 139 41 -65 139 41 -90 139 41 -115 139 41 -139 139 41 -164 139 41 -180 131 32 -205 131 32 -222 123 32 -230 123 41 -230 123 57 -238 131 74 -255 131 74 -255 139 90 -0 172 49 -16 164 41 -41 164 41 -65 164 41 -90 164 41 -115 164 41 -139 164 41 -164 164 41 -180 156 32 -205 148 32 -222 148 32 -230 148 41 -230 139 57 -238 148 74 -255 148 74 -255 148 90 -0 189 41 -16 189 41 -32 180 32 -57 180 32 -82 180 32 -106 180 32 -131 180 32 -156 180 32 -180 180 32 -205 172 32 -222 172 32 -230 164 41 -230 156 57 -238 164 74 -255 164 74 -255 164 90 -0 205 41 -16 205 41 -32 205 32 -57 205 32 -82 205 32 -106 205 32 -131 205 32 -156 205 32 -180 205 32 -205 205 32 -222 197 32 -230 180 41 -230 172 57 -238 180 74 -255 180 74 -255 180 90 -0 222 41 -8 222 32 -32 222 32 -57 222 32 -82 222 32 -106 222 32 -123 222 32 -148 222 32 -172 222 32 -197 222 32 -222 222 32 -230 205 41 -230 197 57 -238 197 74 -255 189 74 -255 189 90 -0 238 32 -8 246 32 -41 230 41 -65 230 41 -82 230 41 -106 230 41 -123 230 41 -148 230 41 -164 230 41 -189 230 41 -205 230 41 -230 230 41 -230 213 57 -238 205 74 -255 213 74 -255 205 90 -0 255 32 -24 246 41 -57 230 57 -74 230 57 -90 230 57 -106 230 57 -123 230 57 -139 230 57 -164 230 57 -180 230 57 -197 230 57 -213 230 57 -230 230 57 -238 222 74 -255 222 74 -255 213 90 -8 255 49 -41 246 49 -74 238 74 -90 238 74 -106 238 74 -123 238 74 -131 238 74 -148 238 74 -164 238 74 -180 238 74 -197 238 74 -213 238 74 -230 238 74 -238 238 74 -255 238 74 -255 230 90 -24 255 57 -57 255 74 -74 255 74 -90 255 74 -106 255 74 -123 255 74 -131 255 74 -148 255 74 -164 255 74 -180 255 74 -197 255 74 -213 255 74 -230 255 74 -238 255 74 -255 255 74 -255 246 90 -57 255 82 -74 255 82 -90 255 90 -106 255 90 -115 255 90 -131 255 90 -139 255 90 -156 255 90 -172 255 90 -180 255 90 -197 255 90 -205 255 90 -222 255 90 -230 255 90 -246 255 90 -255 255 90 diff --git a/graphics/misc/sunny_day/51.pal b/graphics/misc/sunny_day/51.pal deleted file mode 100644 index c168d18961..0000000000 --- a/graphics/misc/sunny_day/51.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 57 -24 8 57 -41 8 57 -57 8 57 -74 8 57 -90 8 57 -106 8 57 -172 0 74 -189 0 74 -205 0 65 -222 0 65 -238 0 65 -255 0 57 -255 8 65 -255 24 82 -255 57 98 -8 24 57 -24 24 57 -41 24 57 -57 24 57 -74 24 57 -90 24 57 -148 16 74 -164 16 65 -189 16 65 -205 16 65 -222 8 57 -246 8 57 -246 24 65 -246 41 74 -255 57 90 -255 74 98 -8 41 57 -24 41 57 -41 41 57 -57 41 57 -74 41 57 -123 41 74 -139 41 65 -164 41 65 -180 32 57 -205 32 57 -222 32 57 -230 41 65 -230 57 74 -238 74 90 -255 74 90 -255 90 106 -8 57 57 -24 57 57 -41 57 57 -57 57 57 -98 65 65 -123 65 65 -139 57 57 -156 57 57 -180 57 57 -197 57 57 -205 57 57 -213 74 74 -230 90 90 -238 90 90 -255 90 90 -255 106 106 -8 74 57 -24 74 57 -41 74 57 -65 98 65 -98 98 65 -123 90 65 -139 90 57 -156 82 57 -180 82 57 -197 74 57 -205 82 57 -213 90 74 -230 98 90 -238 106 90 -255 106 90 -255 115 106 -8 90 57 -24 90 57 -41 123 65 -65 123 65 -90 123 65 -123 123 65 -139 115 57 -156 106 57 -180 106 57 -197 98 57 -205 106 57 -213 106 74 -230 115 90 -238 115 90 -255 123 90 -255 131 106 -8 106 57 -16 148 65 -41 139 65 -57 139 57 -90 139 57 -115 139 57 -139 139 57 -156 131 57 -180 131 57 -197 123 57 -205 123 57 -213 123 74 -230 131 90 -238 131 90 -255 139 90 -255 148 106 -0 172 65 -16 164 65 -41 164 57 -57 156 57 -82 156 57 -106 156 57 -131 156 57 -156 156 57 -180 156 57 -197 148 57 -205 148 57 -213 139 74 -230 148 90 -238 148 90 -255 148 90 -255 156 106 -0 189 65 -16 189 65 -32 180 57 -57 180 57 -82 180 57 -106 180 57 -131 180 57 -156 180 57 -180 180 57 -197 172 57 -205 164 57 -213 164 74 -230 164 90 -238 164 90 -255 164 90 -255 164 106 -0 205 65 -16 205 65 -32 205 57 -57 197 57 -82 197 57 -106 197 57 -123 197 57 -148 197 57 -172 197 57 -197 197 57 -205 189 57 -213 180 74 -230 180 90 -238 180 90 -255 180 90 -255 180 106 -0 222 57 -8 222 57 -32 222 57 -57 205 57 -82 205 57 -106 205 57 -123 205 57 -148 205 57 -164 205 57 -189 205 57 -205 205 57 -213 197 74 -230 197 90 -238 197 90 -255 197 90 -255 189 106 -0 238 57 -8 246 49 -41 230 65 -74 213 74 -90 213 74 -106 213 74 -123 213 74 -139 213 74 -164 213 74 -180 213 74 -197 213 74 -213 213 74 -230 213 90 -238 205 90 -255 205 90 -255 205 106 -0 255 57 -24 246 57 -57 230 74 -90 230 90 -106 230 90 -123 230 90 -131 230 90 -148 230 90 -164 230 90 -180 230 90 -197 230 90 -213 230 90 -230 230 90 -238 222 90 -255 222 90 -255 222 106 -8 255 65 -41 246 65 -74 238 90 -90 238 90 -106 238 90 -123 238 90 -131 238 90 -148 238 90 -164 238 90 -180 238 90 -197 238 90 -213 238 90 -230 238 90 -238 238 90 -255 238 90 -255 230 106 -24 255 74 -57 255 90 -74 255 90 -90 255 90 -106 255 90 -123 255 90 -139 255 90 -156 255 90 -172 255 90 -180 255 90 -197 255 90 -213 255 90 -222 255 90 -238 255 90 -255 255 90 -255 246 106 -57 255 90 -74 255 98 -90 255 98 -106 255 106 -123 255 106 -131 255 106 -148 255 106 -156 255 106 -172 255 106 -180 255 106 -197 255 106 -205 255 106 -222 255 106 -230 255 106 -246 255 106 -255 255 106 diff --git a/graphics/misc/sunny_day/52.pal b/graphics/misc/sunny_day/52.pal deleted file mode 100644 index 4589fe0fc3..0000000000 --- a/graphics/misc/sunny_day/52.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 74 -24 8 74 -41 8 74 -57 8 74 -74 8 74 -90 8 74 -106 8 74 -172 0 98 -189 0 90 -205 0 90 -222 0 90 -238 0 82 -255 0 82 -255 8 90 -255 24 98 -255 57 106 -8 24 74 -24 24 74 -41 24 74 -57 24 74 -74 24 74 -90 24 74 -148 16 98 -164 16 90 -189 16 90 -205 16 90 -222 8 82 -246 8 82 -246 24 90 -246 41 90 -255 57 106 -255 74 115 -8 41 74 -24 41 74 -41 41 74 -57 41 74 -74 41 74 -123 41 98 -139 41 90 -164 41 90 -180 32 82 -205 32 82 -222 32 82 -230 41 82 -230 57 90 -238 74 106 -255 74 106 -255 90 115 -8 57 74 -24 57 74 -41 57 74 -65 65 98 -98 65 98 -123 65 90 -139 57 90 -156 57 82 -180 57 82 -197 57 82 -205 57 82 -213 74 90 -230 90 106 -238 90 106 -255 90 106 -255 106 123 -8 74 74 -24 74 74 -41 74 74 -65 98 98 -98 90 90 -115 82 82 -139 82 82 -156 74 74 -180 74 74 -189 82 82 -197 90 90 -213 98 98 -230 106 106 -238 106 106 -255 106 106 -255 123 123 -8 90 74 -24 90 74 -41 123 98 -65 123 90 -82 115 82 -115 115 82 -139 106 82 -156 106 74 -180 98 74 -189 98 82 -197 106 90 -213 115 98 -230 115 106 -238 123 106 -255 123 106 -255 131 123 -8 106 74 -16 148 98 -41 139 90 -57 139 90 -82 139 82 -106 139 82 -139 139 82 -156 131 74 -180 123 74 -189 123 82 -197 123 90 -213 131 98 -230 131 106 -238 139 106 -255 139 106 -255 148 123 -0 172 98 -16 164 90 -41 164 90 -57 156 82 -74 156 74 -106 156 74 -131 156 74 -156 156 74 -180 148 74 -189 148 82 -197 139 90 -213 148 98 -230 148 106 -238 148 106 -255 148 106 -255 156 123 -0 189 90 -16 189 90 -32 180 82 -57 180 82 -74 180 74 -98 180 74 -123 180 74 -148 180 74 -180 180 74 -189 164 82 -197 156 90 -213 164 98 -230 164 106 -238 164 106 -255 164 106 -255 172 123 -0 205 90 -16 205 82 -32 205 82 -57 197 74 -82 189 82 -106 189 82 -123 189 82 -148 189 82 -164 189 82 -189 189 82 -197 180 90 -213 180 98 -230 180 106 -238 180 106 -255 180 106 -255 180 123 -0 222 82 -8 222 82 -32 222 82 -57 205 82 -90 197 90 -106 197 90 -123 197 90 -139 197 90 -164 197 90 -180 197 90 -197 197 90 -213 197 98 -230 197 106 -238 197 106 -255 197 106 -255 197 123 -0 238 82 -8 246 74 -41 230 82 -74 213 90 -98 213 98 -115 213 98 -131 213 98 -148 213 98 -164 213 98 -180 213 98 -197 213 98 -213 213 98 -230 213 106 -238 213 106 -255 205 106 -255 205 123 -0 255 82 -24 246 82 -57 230 90 -90 230 98 -106 230 106 -123 230 106 -131 230 106 -148 230 106 -164 230 106 -180 230 106 -197 230 106 -213 230 106 -230 230 106 -238 222 106 -255 222 106 -255 222 123 -8 255 82 -41 246 90 -74 238 98 -90 238 106 -106 238 106 -123 238 106 -139 238 106 -148 238 106 -164 238 106 -180 238 106 -197 238 106 -213 238 106 -230 238 106 -238 238 106 -255 238 106 -255 230 123 -24 255 90 -57 255 98 -74 255 98 -90 255 106 -106 255 106 -123 255 106 -139 255 106 -156 255 106 -164 255 106 -180 255 106 -197 255 106 -213 255 106 -230 255 106 -238 255 106 -255 255 106 -255 246 123 -57 255 106 -74 255 106 -90 255 115 -106 255 115 -123 255 123 -139 255 123 -148 255 123 -164 255 123 -172 255 123 -189 255 123 -197 255 123 -205 255 123 -222 255 123 -230 255 123 -246 255 123 -255 255 123 diff --git a/graphics/misc/sunny_day/53.pal b/graphics/misc/sunny_day/53.pal deleted file mode 100644 index 833a155113..0000000000 --- a/graphics/misc/sunny_day/53.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 90 -24 8 90 -41 8 90 -57 8 90 -74 8 90 -90 8 90 -106 8 90 -172 0 123 -189 0 115 -205 0 115 -222 0 106 -238 0 106 -255 0 106 -255 8 106 -255 24 115 -255 57 123 -8 24 90 -24 24 90 -41 24 90 -57 24 90 -74 24 90 -90 24 90 -148 16 123 -164 16 115 -189 16 115 -205 16 106 -222 8 106 -246 8 106 -246 24 106 -246 41 106 -255 57 123 -255 74 131 -8 41 90 -24 41 90 -41 41 123 -65 41 123 -98 41 123 -123 41 123 -139 41 115 -164 41 115 -180 32 106 -205 32 106 -222 32 106 -230 41 106 -230 57 106 -238 74 123 -255 74 123 -255 90 131 -8 57 90 -24 57 90 -41 74 123 -65 65 123 -90 65 123 -123 65 123 -139 57 115 -156 57 106 -180 57 106 -197 57 106 -205 57 106 -213 74 106 -230 90 123 -238 90 123 -255 90 123 -255 106 131 -8 74 90 -24 74 90 -41 98 123 -65 90 123 -82 82 115 -115 82 115 -139 82 106 -156 74 106 -180 74 98 -189 82 106 -197 90 106 -213 98 115 -230 106 123 -238 106 123 -255 106 123 -255 123 139 -8 90 90 -24 90 90 -41 123 123 -65 123 123 -82 115 115 -115 106 106 -131 98 98 -156 98 98 -172 98 98 -180 106 106 -197 115 115 -213 115 115 -230 123 123 -238 123 123 -255 131 131 -255 139 139 -8 106 90 -16 148 123 -41 139 115 -57 139 115 -82 139 106 -98 131 98 -131 131 98 -156 123 98 -172 123 98 -180 123 106 -197 131 115 -213 131 115 -230 131 123 -238 139 123 -255 139 131 -255 148 139 -0 172 123 -16 164 115 -41 164 115 -57 156 106 -74 156 106 -98 156 98 -123 156 98 -156 156 98 -172 148 98 -180 139 106 -197 148 115 -213 148 115 -230 148 123 -238 156 123 -255 156 131 -255 164 139 -0 189 115 -16 189 115 -32 180 106 -57 180 106 -74 180 98 -98 172 98 -123 172 98 -148 172 98 -172 172 98 -180 164 106 -197 164 115 -213 164 115 -230 164 123 -238 164 123 -255 164 131 -255 172 139 -0 205 115 -16 205 106 -32 205 106 -57 197 98 -82 189 98 -106 180 106 -123 180 106 -139 180 106 -164 180 106 -180 180 106 -197 180 115 -213 180 115 -230 180 123 -238 180 123 -255 180 131 -255 189 139 -0 222 106 -8 222 106 -32 222 98 -57 205 106 -90 197 106 -115 197 115 -131 197 115 -148 197 115 -164 197 115 -180 197 115 -197 197 115 -213 197 115 -230 197 123 -238 197 123 -255 197 131 -255 197 139 -0 238 106 -8 246 98 -41 230 98 -74 213 106 -98 213 115 -115 213 115 -131 213 115 -148 213 115 -164 213 115 -180 213 115 -197 213 115 -213 213 115 -230 213 123 -238 213 123 -255 213 131 -255 205 139 -0 255 98 -24 246 98 -57 230 106 -90 230 115 -106 230 115 -123 230 123 -139 230 123 -156 230 123 -164 230 123 -180 230 123 -197 230 123 -213 230 123 -230 230 123 -238 222 123 -255 222 131 -255 222 139 -8 255 98 -41 246 106 -74 238 115 -90 238 115 -106 238 123 -123 238 123 -139 238 123 -156 238 123 -172 238 123 -180 238 123 -197 238 123 -213 238 123 -230 238 123 -238 238 123 -255 238 131 -255 230 139 -24 255 106 -57 255 115 -74 255 123 -90 255 123 -106 255 123 -131 255 131 -139 255 131 -156 255 131 -172 255 131 -180 255 131 -197 255 131 -213 255 131 -230 255 131 -238 255 131 -255 255 131 -255 246 139 -57 255 123 -74 255 123 -90 255 123 -106 255 131 -123 255 131 -139 255 139 -156 255 139 -164 255 139 -172 255 139 -189 255 139 -197 255 139 -213 255 139 -222 255 139 -238 255 139 -246 255 139 -255 255 139 diff --git a/graphics/misc/sunny_day/54.pal b/graphics/misc/sunny_day/54.pal deleted file mode 100644 index cfe2f15c79..0000000000 --- a/graphics/misc/sunny_day/54.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 106 -24 8 106 -41 8 106 -57 8 106 -74 8 106 -90 8 106 -106 8 106 -172 0 148 -189 0 139 -205 0 139 -222 0 131 -238 0 131 -255 0 123 -255 8 123 -255 24 131 -255 57 139 -8 24 106 -16 16 148 -41 16 148 -65 16 148 -98 16 148 -123 16 148 -148 16 148 -164 16 139 -189 16 139 -205 16 131 -222 8 131 -246 8 123 -246 24 131 -246 41 123 -255 57 131 -255 74 139 -8 41 106 -16 49 148 -41 41 139 -65 41 139 -90 41 139 -115 41 139 -139 41 139 -164 41 139 -180 32 131 -205 32 131 -222 32 123 -230 41 123 -230 57 123 -238 74 131 -255 74 131 -255 90 139 -8 57 106 -16 74 148 -41 65 139 -57 57 139 -90 57 139 -115 57 139 -139 57 139 -156 57 131 -180 57 131 -197 57 123 -205 57 123 -213 74 123 -230 90 131 -238 90 131 -255 90 139 -255 106 148 -8 74 106 -16 98 148 -41 90 139 -57 90 139 -82 82 139 -106 82 139 -139 82 139 -156 74 131 -180 74 123 -189 82 123 -197 90 123 -213 98 131 -230 106 131 -238 106 139 -255 106 139 -255 123 148 -8 90 106 -16 123 148 -41 115 139 -57 115 139 -82 106 139 -98 98 131 -131 98 131 -156 98 123 -172 98 123 -180 106 123 -197 115 131 -213 115 131 -230 123 139 -238 123 139 -255 131 139 -255 139 156 -8 106 106 -16 148 148 -41 139 139 -57 139 139 -82 139 139 -98 131 131 -131 115 115 -148 115 115 -164 123 123 -180 131 131 -197 131 131 -213 131 131 -230 139 139 -238 139 139 -255 148 148 -255 156 156 -0 172 148 -16 164 139 -41 164 139 -57 156 131 -74 156 131 -98 156 123 -115 148 115 -148 148 115 -164 139 123 -180 148 131 -197 148 131 -213 148 131 -230 148 139 -238 156 139 -255 156 148 -255 164 156 -0 189 139 -16 189 131 -32 180 131 -57 180 131 -74 180 123 -98 172 123 -123 164 123 -139 164 123 -164 164 123 -180 164 131 -197 164 131 -213 164 131 -230 164 139 -238 172 139 -255 172 148 -255 180 156 -0 205 131 -16 205 131 -32 205 131 -57 197 123 -82 189 123 -106 180 123 -131 180 131 -148 180 131 -164 180 131 -180 180 131 -197 180 131 -213 180 131 -230 180 139 -238 180 139 -255 189 148 -255 189 156 -0 222 131 -8 222 131 -32 222 123 -57 205 123 -90 197 123 -115 197 131 -131 197 131 -148 197 131 -164 197 131 -180 197 131 -197 197 131 -213 197 131 -230 197 139 -238 197 139 -255 197 148 -255 205 156 -0 238 123 -8 246 123 -41 230 123 -74 213 123 -98 213 131 -115 213 131 -131 213 131 -148 213 131 -164 213 131 -180 213 131 -197 213 131 -213 213 131 -230 213 139 -238 213 139 -255 213 148 -255 213 156 -0 255 123 -24 246 123 -57 230 123 -90 230 131 -106 230 131 -123 230 131 -139 230 139 -156 230 139 -164 230 139 -180 230 139 -197 230 139 -213 230 139 -230 230 139 -238 222 139 -255 230 148 -255 222 156 -8 255 123 -41 246 123 -74 238 131 -90 238 131 -106 238 139 -123 238 139 -139 238 139 -156 238 139 -172 238 139 -180 238 139 -197 238 139 -213 238 139 -230 238 139 -238 238 139 -255 238 148 -255 238 156 -24 255 123 -57 255 131 -74 255 131 -90 255 139 -106 255 139 -131 255 139 -148 255 148 -156 255 148 -172 255 148 -189 255 148 -197 255 148 -213 255 148 -230 255 148 -238 255 148 -255 255 148 -255 246 156 -57 255 131 -74 255 139 -90 255 139 -106 255 148 -123 255 148 -139 255 148 -156 255 156 -172 255 156 -180 255 156 -189 255 156 -205 255 156 -213 255 156 -222 255 156 -238 255 156 -246 255 156 -255 255 156 diff --git a/graphics/misc/sunny_day/55.pal b/graphics/misc/sunny_day/55.pal deleted file mode 100644 index c1b30ed9e3..0000000000 --- a/graphics/misc/sunny_day/55.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 172 -16 0 172 -49 0 172 -65 0 172 -98 0 172 -123 0 172 -148 0 172 -172 0 172 -189 0 164 -205 0 164 -222 0 156 -238 0 148 -255 0 148 -255 8 148 -255 24 139 -255 57 148 -0 24 172 -16 16 164 -41 16 164 -65 16 164 -90 16 164 -115 16 164 -139 16 164 -164 16 164 -189 16 164 -205 16 156 -222 8 156 -246 8 148 -246 24 148 -246 41 139 -255 57 148 -255 74 156 -0 49 172 -16 41 164 -41 41 164 -57 41 164 -90 41 164 -115 41 164 -139 41 164 -164 41 164 -180 32 156 -205 32 156 -222 32 148 -230 41 148 -230 57 139 -238 74 148 -255 74 148 -255 90 156 -0 74 172 -16 65 164 -41 65 164 -57 57 156 -82 57 156 -106 57 156 -131 57 156 -156 57 156 -180 57 156 -197 57 148 -205 57 148 -213 74 139 -230 90 148 -238 90 148 -255 90 156 -255 106 156 -0 98 172 -16 90 164 -41 90 164 -57 82 156 -74 74 156 -106 74 156 -131 74 156 -156 74 156 -180 74 148 -189 82 148 -197 90 139 -213 98 148 -230 106 148 -238 106 148 -255 106 156 -255 123 164 -0 123 172 -16 115 164 -41 115 164 -57 106 156 -74 106 156 -98 98 156 -123 98 156 -156 98 156 -172 98 148 -180 106 139 -197 115 148 -213 115 148 -230 123 156 -238 123 156 -255 131 156 -255 139 164 -0 148 172 -16 139 164 -41 139 164 -57 131 156 -74 131 156 -98 123 156 -115 115 148 -148 115 148 -164 123 139 -180 131 148 -197 131 148 -213 131 148 -230 139 156 -238 139 156 -255 148 156 -255 156 172 -0 172 172 -16 164 164 -41 164 164 -57 156 156 -74 156 156 -98 156 156 -115 148 148 -148 139 139 -172 148 148 -180 148 148 -197 148 148 -213 148 148 -230 156 156 -238 156 156 -255 164 164 -255 172 172 -0 189 164 -16 189 156 -32 180 156 -57 180 156 -74 180 148 -98 172 148 -123 164 139 -148 172 148 -172 172 148 -180 164 148 -197 164 148 -213 164 148 -230 164 156 -238 172 156 -255 172 164 -255 180 172 -0 205 156 -16 205 156 -32 205 148 -57 197 148 -82 189 148 -106 180 139 -131 180 148 -148 180 148 -164 180 148 -180 180 148 -197 180 148 -213 180 148 -230 180 156 -238 180 156 -255 189 164 -255 197 172 -0 222 148 -8 222 148 -32 222 148 -57 205 148 -90 197 139 -115 197 148 -131 197 148 -148 197 148 -164 197 148 -180 197 148 -197 197 148 -213 197 148 -230 197 156 -238 197 156 -255 197 164 -255 205 172 -0 238 148 -8 246 148 -41 230 148 -74 213 139 -98 213 148 -115 213 148 -131 213 148 -148 213 148 -164 213 148 -180 213 148 -197 213 148 -213 213 148 -230 213 156 -238 213 156 -255 213 164 -255 213 172 -0 255 148 -24 246 139 -57 230 139 -90 230 148 -106 230 148 -123 230 148 -139 230 148 -156 230 156 -172 230 156 -180 230 156 -197 230 156 -213 230 156 -230 230 156 -238 222 156 -255 230 164 -255 230 172 -8 255 139 -41 246 139 -74 238 148 -90 238 148 -106 238 148 -123 238 156 -139 238 156 -156 238 156 -172 238 156 -189 238 156 -197 238 156 -213 238 156 -230 238 156 -238 238 156 -255 238 164 -255 238 172 -24 255 139 -57 255 148 -74 255 148 -90 255 148 -106 255 148 -131 255 156 -148 255 156 -164 255 164 -172 255 164 -189 255 164 -205 255 164 -213 255 164 -230 255 164 -238 255 164 -255 255 164 -255 246 172 -57 255 148 -74 255 148 -90 255 148 -106 255 156 -123 255 156 -139 255 164 -156 255 164 -172 255 172 -189 255 172 -197 255 172 -205 255 172 -213 255 172 -230 255 172 -238 255 172 -246 255 172 -255 255 172 diff --git a/graphics/misc/sunny_day/56.pal b/graphics/misc/sunny_day/56.pal deleted file mode 100644 index eb5b90f0c9..0000000000 --- a/graphics/misc/sunny_day/56.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 189 -16 0 189 -41 0 189 -65 0 189 -90 0 189 -115 0 189 -139 0 189 -164 0 189 -189 0 189 -205 0 189 -222 0 180 -238 0 172 -255 0 172 -255 8 164 -255 24 164 -255 57 164 -0 24 189 -16 16 189 -41 16 189 -65 16 189 -90 16 189 -115 16 189 -131 16 189 -156 16 189 -189 16 189 -205 16 180 -222 8 180 -246 8 172 -246 24 164 -246 41 164 -255 57 164 -255 74 164 -0 41 189 -16 41 189 -32 32 180 -57 32 180 -82 32 180 -106 32 180 -131 32 180 -156 32 180 -180 32 180 -205 32 180 -222 32 172 -230 41 164 -230 57 164 -238 74 164 -255 74 164 -255 90 172 -0 74 189 -16 65 189 -32 57 180 -57 57 180 -82 57 180 -106 57 180 -131 57 180 -156 57 180 -180 57 180 -197 57 172 -205 57 164 -213 74 164 -230 90 164 -238 90 164 -255 90 172 -255 106 172 -0 90 189 -16 90 189 -32 82 180 -57 82 180 -74 74 180 -98 74 180 -123 74 180 -148 74 180 -180 74 180 -189 82 164 -197 90 164 -213 98 164 -230 106 164 -238 106 164 -255 106 164 -255 123 172 -0 115 189 -16 115 189 -32 106 180 -57 106 180 -74 98 180 -98 98 172 -123 98 172 -148 98 172 -172 98 172 -180 106 164 -197 115 164 -213 115 164 -230 123 164 -238 123 172 -255 131 172 -255 139 172 -0 139 189 -16 139 189 -32 131 180 -57 131 180 -74 123 180 -98 123 172 -123 123 164 -139 123 164 -164 123 164 -180 131 164 -197 131 164 -213 131 164 -230 139 164 -238 139 172 -255 148 172 -255 156 180 -0 164 189 -16 164 189 -32 156 180 -57 156 180 -74 148 180 -98 148 172 -123 139 164 -148 148 172 -172 148 172 -180 148 164 -197 148 164 -213 148 164 -230 156 172 -238 156 172 -255 164 172 -255 172 189 -0 189 189 -16 189 189 -32 180 180 -57 180 180 -74 180 180 -98 172 172 -123 164 164 -148 172 172 -172 164 164 -189 164 164 -197 164 164 -213 164 164 -230 172 172 -238 172 172 -255 180 180 -255 205 205 -0 205 180 -16 205 180 -32 205 172 -57 197 172 -82 189 164 -106 180 164 -131 180 164 -148 180 164 -164 189 164 -189 189 164 -197 180 164 -213 180 164 -230 189 172 -238 189 172 -255 189 180 -255 205 205 -0 222 172 -8 222 172 -32 222 172 -57 205 164 -90 197 156 -115 197 164 -131 197 164 -148 197 164 -164 197 164 -180 197 164 -197 197 164 -213 197 164 -230 197 172 -238 197 172 -255 205 180 -255 222 205 -0 238 172 -8 246 172 -41 230 164 -74 213 164 -98 213 164 -115 213 164 -131 213 164 -148 213 164 -164 213 164 -180 213 164 -197 213 164 -213 213 164 -230 213 172 -238 213 172 -255 213 180 -255 222 205 -0 255 164 -24 246 164 -57 230 156 -90 230 164 -106 230 164 -123 230 164 -139 230 164 -156 230 164 -172 230 172 -189 230 172 -197 230 172 -213 230 172 -230 230 172 -238 230 172 -255 230 180 -255 230 205 -8 255 156 -41 246 156 -74 238 164 -90 238 164 -106 238 164 -123 238 164 -139 238 172 -156 238 172 -172 238 172 -189 238 172 -205 238 172 -213 238 172 -230 238 172 -238 238 172 -255 238 180 -255 238 205 -24 255 156 -57 255 164 -74 255 164 -90 255 164 -106 255 164 -131 255 164 -148 255 172 -164 255 172 -180 255 180 -189 255 180 -205 255 180 -213 255 180 -230 255 180 -238 255 180 -255 255 180 -255 246 205 -57 255 164 -74 255 164 -90 255 164 -106 255 164 -123 255 172 -139 255 172 -156 255 180 -172 255 180 -205 255 205 -213 255 205 -222 255 205 -230 255 205 -238 255 205 -246 255 205 -255 255 205 -255 255 205 diff --git a/graphics/misc/sunny_day/57.pal b/graphics/misc/sunny_day/57.pal deleted file mode 100644 index 90584e92e8..0000000000 --- a/graphics/misc/sunny_day/57.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 205 -16 0 205 -41 0 205 -65 0 205 -90 0 205 -115 0 205 -131 0 205 -156 0 205 -180 0 205 -205 0 205 -222 0 197 -238 0 197 -255 0 189 -255 8 180 -255 24 180 -255 57 180 -0 16 205 -16 16 205 -41 16 205 -65 16 205 -82 16 205 -106 16 205 -131 16 205 -156 16 205 -180 16 205 -205 16 205 -222 8 205 -246 8 197 -246 24 189 -246 41 180 -255 57 180 -255 74 180 -0 41 205 -16 41 205 -32 32 205 -57 32 205 -82 32 205 -106 32 205 -131 32 205 -148 32 205 -172 32 205 -205 32 205 -222 32 197 -230 41 189 -230 57 180 -238 74 180 -255 74 180 -255 90 180 -0 65 205 -16 65 205 -32 57 205 -57 57 197 -74 57 197 -98 57 197 -123 57 197 -148 57 197 -172 57 197 -197 57 197 -205 57 189 -213 74 180 -230 90 180 -238 90 180 -255 90 180 -255 106 180 -0 90 205 -16 90 205 -32 82 205 -57 82 197 -82 82 189 -98 82 189 -123 82 189 -148 82 189 -164 82 189 -189 82 189 -197 90 180 -213 98 180 -230 106 180 -238 106 180 -255 106 180 -255 123 189 -0 115 205 -16 106 205 -32 106 205 -57 106 197 -82 106 189 -106 106 180 -123 106 180 -139 106 180 -164 106 180 -180 106 180 -197 115 180 -213 115 180 -230 123 180 -238 123 180 -255 131 180 -255 139 189 -0 139 205 -16 131 205 -32 131 205 -57 123 197 -82 123 189 -106 123 180 -131 131 180 -148 131 180 -164 131 180 -180 131 180 -197 131 180 -213 131 180 -230 139 180 -238 139 180 -255 148 189 -255 156 189 -0 164 205 -16 156 205 -32 156 205 -57 148 197 -82 148 189 -106 139 180 -131 148 180 -148 148 180 -164 148 180 -180 148 180 -197 148 180 -213 148 180 -230 156 180 -238 156 189 -255 164 189 -255 172 197 -0 189 205 -16 180 205 -32 180 205 -57 172 197 -82 164 189 -106 164 180 -131 164 180 -148 164 180 -164 164 189 -189 164 189 -197 164 180 -213 164 180 -230 172 189 -238 172 189 -255 180 189 -255 205 213 -0 205 205 -16 205 205 -32 205 205 -57 197 197 -82 189 189 -106 180 180 -131 180 180 -148 180 180 -164 189 189 -189 180 180 -197 180 180 -213 180 180 -230 189 189 -238 189 189 -255 205 205 -255 222 222 -0 222 197 -8 222 197 -32 222 197 -57 205 189 -90 197 180 -115 197 180 -131 197 180 -148 197 180 -164 197 180 -180 197 180 -197 197 180 -213 197 180 -230 197 189 -238 205 189 -255 213 205 -255 222 222 -0 238 189 -8 246 189 -41 230 180 -74 213 180 -98 213 180 -115 213 180 -131 213 180 -148 213 180 -164 213 180 -180 213 180 -197 213 180 -213 213 180 -230 213 189 -238 213 189 -255 222 205 -255 230 222 -0 255 189 -24 246 180 -57 230 172 -90 230 180 -106 230 180 -123 230 180 -139 230 180 -156 230 180 -172 230 189 -189 230 189 -197 230 189 -213 230 189 -230 230 189 -238 230 189 -255 230 205 -255 238 222 -8 255 180 -41 246 172 -74 238 180 -90 238 180 -106 238 180 -123 238 180 -139 238 180 -156 238 180 -172 238 189 -189 238 189 -205 238 189 -213 238 189 -230 238 189 -238 238 189 -255 246 205 -255 246 222 -24 255 172 -57 255 180 -74 255 180 -90 255 180 -106 255 180 -131 255 180 -148 255 189 -164 255 189 -180 255 189 -205 255 205 -213 255 205 -222 255 205 -238 255 205 -246 255 205 -255 255 205 -255 255 222 -57 255 172 -74 255 180 -90 255 180 -106 255 180 -123 255 180 -139 255 189 -156 255 189 -172 255 197 -205 255 205 -222 255 222 -222 255 222 -230 255 222 -238 255 222 -246 255 222 -255 255 222 -255 255 222 diff --git a/graphics/misc/sunny_day/58.pal b/graphics/misc/sunny_day/58.pal deleted file mode 100644 index 6c208a4aab..0000000000 --- a/graphics/misc/sunny_day/58.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 222 -16 0 222 -41 0 222 -57 0 222 -82 0 222 -106 0 222 -131 0 222 -148 0 222 -172 0 222 -197 0 222 -222 0 222 -238 0 222 -255 0 213 -255 8 197 -255 24 197 -255 57 189 -0 16 222 -8 8 222 -32 8 222 -57 8 222 -82 8 222 -106 8 222 -131 8 222 -148 8 222 -172 8 222 -197 8 222 -222 8 222 -246 8 222 -246 24 205 -246 41 197 -255 57 197 -255 74 197 -0 41 222 -8 32 222 -32 32 222 -57 32 222 -82 32 222 -98 32 222 -123 32 222 -148 32 222 -172 32 222 -197 32 222 -222 32 222 -230 41 205 -230 57 197 -238 74 197 -255 74 197 -255 90 197 -0 65 222 -8 57 222 -32 57 222 -57 57 205 -82 57 205 -106 57 205 -123 57 205 -148 57 205 -164 57 205 -189 57 205 -205 57 205 -213 74 197 -230 90 197 -238 90 197 -255 90 197 -255 106 197 -0 90 222 -8 82 222 -32 82 222 -57 82 205 -90 90 197 -106 90 197 -123 90 197 -139 90 197 -156 90 197 -180 90 197 -197 90 197 -213 98 197 -230 106 197 -238 106 197 -255 106 197 -255 123 197 -0 106 222 -8 106 222 -32 106 222 -57 106 205 -90 106 197 -115 115 197 -131 115 197 -148 115 197 -164 115 197 -180 115 197 -197 115 197 -213 115 197 -230 123 197 -238 123 197 -255 131 197 -255 139 197 -0 131 222 -8 131 222 -32 123 222 -57 123 205 -90 123 197 -115 131 197 -131 131 197 -148 131 197 -164 131 197 -180 131 197 -197 131 197 -213 131 197 -230 139 197 -238 139 197 -255 148 197 -255 156 205 -0 156 222 -8 156 222 -32 148 222 -57 148 205 -90 139 197 -115 148 197 -131 148 197 -148 148 197 -164 148 197 -180 148 197 -197 148 197 -213 148 197 -230 156 197 -238 156 197 -255 164 205 -255 172 205 -0 180 222 -8 180 222 -32 172 222 -57 164 205 -90 164 197 -115 164 197 -131 164 197 -148 164 197 -164 164 197 -180 164 197 -197 164 197 -213 164 197 -230 172 197 -238 172 205 -255 180 205 -255 205 222 -0 197 222 -8 205 222 -32 197 222 -57 189 205 -90 180 197 -115 180 197 -131 180 197 -148 180 197 -164 180 197 -180 180 197 -197 180 197 -213 180 197 -230 189 197 -238 189 205 -255 205 213 -255 222 222 -0 222 222 -8 222 222 -32 222 222 -57 205 205 -90 197 197 -115 197 197 -131 197 197 -148 197 197 -164 197 197 -180 197 197 -205 197 197 -213 197 197 -230 205 205 -246 213 213 -255 222 222 -255 238 238 -0 238 213 -8 246 213 -41 230 205 -74 213 197 -98 213 197 -115 213 197 -131 213 197 -148 213 197 -164 213 197 -180 213 197 -197 213 197 -213 213 197 -230 213 205 -246 222 213 -255 230 222 -255 238 238 -0 255 205 -24 246 205 -57 230 197 -90 230 197 -106 230 197 -123 230 197 -139 230 197 -156 230 197 -172 230 197 -189 230 197 -205 230 205 -213 230 205 -230 230 205 -246 238 213 -255 238 222 -255 246 238 -8 255 197 -41 246 197 -74 238 197 -90 238 197 -106 238 197 -123 238 197 -139 238 197 -156 238 197 -172 238 197 -189 238 205 -213 246 213 -222 246 213 -238 246 213 -246 246 213 -255 246 222 -255 246 238 -24 255 189 -57 255 197 -74 255 189 -90 255 197 -106 255 197 -131 255 197 -148 255 197 -164 255 197 -180 255 205 -205 255 213 -222 255 222 -230 255 222 -238 255 222 -246 255 222 -255 255 222 -255 255 238 -57 255 189 -74 255 189 -90 255 189 -106 255 189 -123 255 197 -139 255 197 -156 255 205 -172 255 205 -205 255 222 -222 255 222 -238 255 238 -238 255 238 -246 255 238 -246 255 238 -255 255 238 -255 255 238 diff --git a/graphics/misc/sunny_day/59.pal b/graphics/misc/sunny_day/59.pal deleted file mode 100644 index fc5d96b1fd..0000000000 --- a/graphics/misc/sunny_day/59.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 238 -16 0 238 -32 0 238 -57 0 238 -82 0 238 -106 0 238 -123 0 238 -148 0 238 -172 0 238 -189 0 238 -213 0 238 -238 0 238 -255 0 238 -255 8 222 -255 24 213 -255 57 205 -0 16 238 -8 8 246 -32 8 246 -49 8 246 -74 8 246 -98 8 246 -123 8 246 -148 8 246 -172 8 246 -189 8 246 -213 8 246 -246 8 246 -246 24 230 -246 41 213 -255 57 213 -255 74 205 -0 41 238 -8 32 246 -41 41 230 -65 41 230 -82 41 230 -98 41 230 -123 41 230 -148 41 230 -164 41 230 -180 41 230 -205 41 230 -230 41 230 -230 57 213 -238 74 213 -255 74 213 -255 90 205 -0 65 238 -8 57 246 -41 65 230 -74 74 213 -90 74 213 -106 74 213 -123 74 213 -139 74 213 -164 74 213 -180 74 213 -197 74 213 -213 74 213 -230 90 213 -238 90 213 -255 90 213 -255 106 205 -0 82 238 -8 82 246 -41 82 230 -74 90 213 -98 98 213 -115 98 213 -131 98 213 -148 98 213 -164 98 213 -180 98 213 -197 98 213 -213 98 213 -230 106 213 -238 106 213 -255 106 213 -255 123 205 -0 106 238 -8 106 246 -41 106 230 -74 106 213 -98 115 213 -115 115 213 -131 115 213 -148 115 213 -164 115 213 -180 115 213 -197 115 213 -213 115 213 -230 123 213 -238 123 213 -255 131 213 -255 139 213 -0 131 238 -8 123 246 -41 123 230 -74 123 213 -98 131 213 -115 131 213 -131 131 213 -148 131 213 -164 131 213 -180 131 213 -197 131 213 -213 131 213 -230 139 213 -238 139 213 -255 148 213 -255 156 213 -0 148 238 -8 148 246 -41 148 230 -74 139 213 -98 148 213 -115 148 213 -131 148 213 -148 148 213 -164 148 213 -180 148 213 -197 148 213 -213 148 213 -230 156 213 -238 156 213 -255 164 213 -255 172 213 -0 172 238 -8 172 246 -41 164 230 -74 164 213 -98 164 213 -115 164 213 -131 164 213 -148 164 213 -164 164 213 -180 164 213 -197 164 213 -213 164 213 -230 172 213 -238 172 213 -255 180 213 -255 205 230 -0 197 238 -8 197 246 -41 189 230 -74 180 213 -98 180 213 -115 180 213 -131 180 213 -148 180 213 -164 180 213 -180 180 213 -197 180 213 -213 180 213 -230 189 213 -238 189 213 -255 205 222 -255 222 230 -0 222 238 -8 222 246 -41 205 230 -74 197 213 -98 197 213 -115 197 213 -131 197 213 -148 197 213 -164 197 213 -180 197 213 -197 197 213 -213 197 213 -230 205 213 -246 213 222 -255 222 230 -255 238 238 -0 238 238 -8 246 246 -41 230 230 -74 213 213 -98 213 213 -115 213 213 -131 213 213 -148 213 213 -164 213 213 -180 213 213 -197 213 213 -222 213 213 -238 222 222 -246 230 230 -255 238 238 -255 255 255 -0 255 230 -24 246 222 -57 230 213 -90 230 213 -106 230 213 -123 230 213 -139 230 213 -156 230 213 -172 230 213 -189 230 213 -205 230 213 -222 238 222 -238 238 222 -246 238 230 -255 246 238 -255 255 255 -8 255 213 -41 246 213 -74 238 205 -90 238 205 -106 238 213 -123 238 213 -139 238 213 -156 238 213 -172 238 213 -189 238 213 -213 246 222 -230 246 230 -238 246 230 -246 246 230 -255 246 238 -255 255 255 -24 255 205 -57 255 205 -74 255 213 -90 255 205 -106 255 205 -131 255 213 -148 255 213 -164 255 213 -180 255 213 -205 255 222 -222 255 230 -238 255 238 -246 255 238 -246 255 238 -255 255 238 -255 255 255 -57 255 197 -74 255 205 -90 255 205 -106 255 205 -123 255 205 -139 255 205 -156 255 213 -172 255 213 -205 255 222 -222 255 230 -238 255 238 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/6.pal b/graphics/misc/sunny_day/6.pal deleted file mode 100644 index b11f0695d4..0000000000 --- a/graphics/misc/sunny_day/6.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 106 -24 8 106 -41 8 106 -57 8 106 -74 8 106 -90 8 106 -106 8 106 -139 0 115 -156 0 115 -172 0 115 -189 0 115 -205 0 115 -222 0 115 -238 0 115 -255 0 106 -255 24 115 -8 24 106 -16 16 115 -41 16 115 -57 16 115 -74 16 115 -98 16 115 -115 16 115 -131 16 115 -156 16 115 -172 16 115 -189 16 115 -205 16 115 -222 16 115 -238 16 106 -246 32 115 -255 41 123 -8 41 106 -16 41 115 -41 41 115 -57 41 115 -74 41 115 -98 41 115 -115 41 115 -131 41 115 -148 32 115 -172 32 115 -189 32 115 -205 32 115 -222 32 106 -230 49 115 -246 49 115 -255 57 123 -8 57 106 -16 57 115 -41 57 115 -57 57 115 -74 57 115 -90 57 115 -115 57 115 -131 57 115 -148 57 115 -164 57 115 -189 49 106 -205 57 106 -213 65 115 -230 65 115 -246 65 123 -255 74 123 -8 74 106 -16 82 115 -41 74 115 -57 74 115 -74 74 115 -90 74 115 -115 74 115 -131 74 115 -148 74 115 -164 74 106 -180 74 106 -197 82 115 -213 82 115 -230 82 123 -246 82 115 -255 90 123 -8 90 106 -16 98 115 -41 98 115 -57 98 115 -74 90 115 -90 90 115 -115 90 115 -131 90 115 -148 90 106 -164 90 106 -180 98 115 -197 98 115 -213 98 115 -230 98 123 -246 106 123 -255 106 123 -8 106 106 -16 115 115 -41 115 115 -57 115 115 -74 115 115 -90 115 115 -115 115 115 -131 106 106 -148 106 106 -164 115 115 -180 115 115 -197 115 115 -213 115 115 -230 123 123 -246 123 123 -255 123 123 -0 139 115 -16 131 115 -41 131 115 -57 131 115 -74 131 115 -90 131 115 -106 131 106 -131 131 106 -148 131 106 -164 131 115 -180 131 115 -197 131 115 -213 131 115 -230 131 123 -246 131 123 -255 139 123 -0 156 115 -16 156 115 -32 148 115 -57 148 106 -74 148 115 -90 148 106 -106 148 106 -131 148 106 -148 148 106 -164 148 115 -180 148 115 -197 148 115 -213 148 115 -230 148 123 -246 156 123 -255 156 123 -0 172 115 -16 172 115 -32 172 115 -57 164 115 -74 164 106 -90 164 106 -115 164 115 -131 164 115 -148 164 115 -164 164 115 -180 164 115 -197 164 115 -213 164 115 -230 164 123 -246 164 123 -255 172 123 -0 189 106 -16 189 115 -32 189 115 -49 189 106 -74 180 106 -98 180 115 -115 180 115 -131 180 115 -148 180 115 -164 180 115 -180 180 115 -197 180 115 -213 180 115 -230 180 123 -246 180 123 -255 180 123 -0 205 106 -16 205 115 -32 205 106 -57 205 106 -82 197 115 -98 197 115 -115 197 115 -131 197 115 -148 197 115 -164 197 115 -180 197 115 -197 197 115 -213 197 115 -230 197 123 -246 197 123 -255 197 123 -0 222 115 -16 222 106 -32 222 106 -65 213 115 -82 213 115 -98 213 115 -115 213 115 -131 213 115 -148 213 115 -164 213 115 -180 213 115 -197 213 115 -213 213 115 -230 213 123 -246 213 123 -255 213 123 -0 238 106 -16 238 106 -49 230 115 -65 230 115 -82 230 115 -98 230 115 -123 230 123 -139 230 123 -156 230 123 -164 230 123 -189 230 123 -197 230 123 -213 230 123 -230 230 123 -246 230 123 -255 230 123 -0 255 106 -32 246 115 -49 246 115 -65 246 115 -82 246 115 -106 246 115 -123 246 123 -139 246 123 -156 246 123 -172 246 123 -180 246 123 -197 246 123 -213 246 123 -230 246 123 -246 246 123 -255 246 123 -24 255 115 -41 255 115 -57 255 115 -74 255 123 -90 255 123 -106 255 123 -123 255 123 -139 255 123 -156 255 123 -172 255 123 -189 255 123 -205 255 123 -213 255 123 -230 255 123 -246 255 123 -255 255 123 diff --git a/graphics/misc/sunny_day/60.pal b/graphics/misc/sunny_day/60.pal deleted file mode 100644 index ebb714dd44..0000000000 --- a/graphics/misc/sunny_day/60.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 255 -16 0 255 -32 0 255 -57 0 255 -82 0 255 -98 0 255 -123 0 255 -148 0 255 -164 0 255 -189 0 255 -205 0 255 -230 0 255 -255 0 255 -255 8 238 -255 24 230 -255 57 222 -0 16 255 -24 24 246 -41 24 246 -57 24 246 -82 24 246 -98 24 246 -123 24 246 -139 24 246 -164 24 246 -180 24 246 -205 24 246 -222 24 246 -246 24 246 -246 41 230 -255 57 230 -255 74 222 -0 41 255 -24 49 246 -57 57 230 -74 57 230 -90 57 230 -106 57 230 -123 57 230 -139 57 230 -156 57 230 -172 57 230 -197 57 230 -213 57 230 -230 57 230 -238 74 230 -255 74 230 -255 90 222 -0 57 255 -24 65 246 -57 74 230 -90 90 230 -98 90 230 -115 90 230 -131 90 230 -148 90 230 -164 90 230 -180 90 230 -197 90 230 -213 90 230 -230 90 230 -238 90 230 -255 90 222 -255 106 222 -0 82 255 -24 90 246 -57 90 230 -90 106 230 -106 106 230 -115 106 230 -131 106 230 -148 106 230 -164 106 230 -180 106 230 -197 106 230 -213 106 230 -230 106 230 -238 106 230 -255 106 230 -255 123 222 -0 106 255 -24 106 246 -57 106 230 -90 123 230 -106 123 230 -123 123 230 -131 123 230 -148 123 230 -164 123 230 -180 123 230 -197 123 230 -213 123 230 -230 123 230 -238 123 230 -255 131 230 -255 139 222 -0 123 255 -24 131 246 -57 123 230 -90 131 230 -106 131 230 -123 139 230 -139 139 230 -148 139 230 -164 139 230 -180 139 230 -197 139 230 -213 139 230 -230 139 230 -238 139 230 -255 148 230 -255 156 222 -0 148 255 -24 148 246 -57 139 230 -90 148 230 -106 148 230 -123 156 230 -139 156 230 -156 156 230 -164 156 230 -180 156 230 -197 156 230 -213 156 230 -230 156 230 -238 156 230 -255 164 230 -255 172 230 -0 172 255 -24 164 246 -57 164 230 -90 164 230 -106 164 230 -123 164 230 -139 164 230 -156 172 230 -172 172 230 -189 172 230 -197 172 230 -213 172 230 -230 172 230 -238 172 230 -255 180 230 -255 205 238 -0 189 255 -24 189 246 -57 180 230 -90 180 230 -106 180 230 -123 180 230 -139 180 230 -156 180 230 -172 189 230 -189 189 230 -197 189 230 -213 189 230 -230 189 230 -238 189 230 -255 205 238 -255 222 238 -0 213 255 -24 205 246 -57 197 230 -90 197 230 -106 197 230 -123 197 230 -139 197 230 -156 197 230 -172 197 230 -189 197 230 -205 205 230 -213 205 230 -230 205 230 -246 213 238 -255 222 238 -255 238 246 -0 238 255 -24 230 246 -57 213 230 -90 213 230 -106 213 230 -123 213 230 -139 213 230 -156 213 230 -172 213 230 -189 213 230 -205 213 230 -222 222 238 -238 222 238 -246 230 238 -255 238 246 -255 255 255 -0 255 255 -24 246 246 -57 230 230 -90 230 230 -106 230 230 -123 230 230 -139 230 230 -156 230 230 -172 230 230 -189 230 230 -205 230 230 -222 238 238 -238 238 238 -246 246 246 -255 255 255 -255 255 255 -8 255 238 -41 246 230 -74 238 222 -90 238 222 -106 238 222 -123 238 222 -139 238 222 -156 238 222 -172 238 230 -189 238 230 -213 246 238 -230 246 238 -246 246 246 -246 246 246 -255 255 255 -255 255 255 -24 255 222 -57 255 222 -74 255 222 -90 255 222 -106 255 222 -131 255 222 -148 255 230 -164 255 230 -180 255 230 -205 255 230 -222 255 238 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -57 255 213 -74 255 222 -90 255 213 -106 255 222 -123 255 222 -139 255 222 -156 255 222 -172 255 230 -205 255 230 -222 255 238 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/61.pal b/graphics/misc/sunny_day/61.pal deleted file mode 100644 index 7ceed14e17..0000000000 --- a/graphics/misc/sunny_day/61.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 255 -24 8 255 -49 8 255 -65 8 255 -82 8 255 -98 8 255 -123 8 255 -139 8 255 -156 8 255 -180 8 255 -197 8 255 -213 8 255 -238 8 255 -255 8 255 -255 24 246 -255 57 230 -8 32 255 -41 41 246 -49 41 246 -65 41 246 -90 41 246 -106 41 246 -123 41 246 -139 41 246 -156 41 246 -172 41 246 -197 41 246 -213 41 246 -230 41 246 -246 41 246 -255 57 246 -255 74 230 -8 49 255 -41 57 246 -74 74 238 -90 74 238 -98 74 238 -115 74 238 -131 74 238 -148 74 238 -164 74 238 -180 74 238 -197 74 238 -205 74 238 -222 74 238 -238 74 238 -255 74 238 -255 90 230 -8 65 255 -41 74 246 -74 90 238 -90 90 238 -106 90 238 -115 90 238 -131 90 238 -148 90 238 -164 90 238 -180 90 238 -197 90 238 -205 90 238 -222 90 238 -238 90 238 -255 90 238 -255 106 230 -8 90 255 -41 90 246 -74 106 238 -90 106 238 -106 106 238 -123 106 238 -139 106 238 -148 106 238 -164 106 238 -180 106 238 -197 106 238 -213 106 238 -222 106 238 -238 106 238 -255 106 238 -255 123 230 -8 106 255 -41 106 246 -74 123 238 -90 123 238 -106 123 238 -123 123 238 -139 123 238 -156 123 238 -164 123 238 -180 123 238 -197 123 238 -213 123 238 -222 123 238 -238 123 238 -255 131 238 -255 139 238 -8 123 255 -41 123 246 -74 131 238 -90 131 238 -106 139 238 -123 139 238 -139 139 238 -156 139 238 -172 139 238 -180 139 238 -197 139 238 -213 139 238 -222 139 238 -238 139 238 -255 148 238 -255 156 238 -8 148 255 -41 139 246 -74 148 238 -90 148 238 -106 148 238 -123 156 238 -139 156 238 -156 156 238 -172 156 238 -180 156 238 -197 156 238 -213 156 238 -222 156 238 -238 156 238 -255 164 238 -255 172 238 -8 164 255 -41 164 246 -74 164 238 -90 164 238 -106 164 238 -123 172 238 -139 172 238 -156 172 238 -172 172 238 -189 172 238 -197 172 238 -213 172 238 -230 172 238 -238 172 238 -255 180 238 -255 205 246 -8 180 255 -41 180 246 -74 180 238 -90 180 238 -106 180 238 -123 180 238 -139 180 238 -156 189 238 -172 189 238 -189 189 238 -205 189 238 -213 189 238 -230 189 238 -238 189 238 -255 205 246 -255 222 246 -8 197 255 -41 197 246 -74 197 238 -90 197 238 -106 197 238 -123 197 238 -139 197 238 -156 197 238 -172 205 238 -189 205 238 -213 213 246 -222 213 246 -238 213 246 -246 213 246 -255 222 246 -255 238 246 -8 222 255 -41 213 246 -74 213 238 -90 213 238 -106 213 238 -123 213 238 -139 213 238 -156 213 238 -172 213 238 -189 213 238 -213 222 246 -230 230 246 -238 230 246 -246 230 246 -255 238 246 -255 255 255 -8 238 255 -41 230 246 -74 230 238 -90 230 238 -106 230 238 -123 230 238 -139 230 238 -156 230 238 -172 230 238 -189 230 238 -213 238 246 -230 238 246 -246 246 246 -246 246 246 -255 255 255 -255 255 255 -8 255 255 -41 246 246 -74 238 238 -90 238 238 -106 238 238 -123 238 238 -139 238 238 -156 238 238 -172 238 238 -189 238 238 -213 246 246 -230 246 246 -246 246 246 -255 255 255 -255 255 255 -255 255 255 -24 255 238 -57 255 238 -74 255 238 -90 255 238 -106 255 238 -131 255 238 -148 255 238 -164 255 238 -180 255 238 -205 255 246 -222 255 246 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -57 255 230 -74 255 230 -90 255 230 -106 255 230 -123 255 230 -139 255 230 -156 255 238 -172 255 238 -205 255 238 -222 255 246 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/62.pal b/graphics/misc/sunny_day/62.pal deleted file mode 100644 index 6bd460ecda..0000000000 --- a/graphics/misc/sunny_day/62.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -24 24 255 -41 24 255 -57 24 255 -74 24 255 -90 24 255 -106 24 255 -123 24 255 -139 24 255 -156 24 255 -172 24 255 -189 24 255 -205 24 255 -222 24 255 -238 24 255 -255 24 255 -255 57 246 -24 49 255 -57 57 255 -74 57 255 -90 57 255 -98 57 255 -115 57 255 -131 57 255 -148 57 255 -164 57 255 -180 57 255 -197 57 255 -205 57 255 -222 57 255 -238 57 255 -255 57 255 -255 74 246 -24 65 255 -57 74 255 -74 74 255 -90 74 255 -98 74 255 -123 74 255 -131 74 255 -148 74 255 -164 74 255 -180 74 255 -189 74 255 -213 74 255 -222 74 255 -238 74 255 -255 74 255 -255 90 246 -24 82 255 -57 90 255 -74 90 255 -90 90 255 -106 90 255 -123 90 255 -139 90 255 -148 90 255 -164 90 255 -180 90 255 -197 90 255 -205 90 255 -222 90 255 -238 90 255 -255 90 255 -255 106 246 -24 98 255 -57 106 255 -74 106 255 -90 106 255 -106 106 255 -123 106 255 -139 106 255 -148 106 255 -164 106 255 -180 106 255 -197 106 255 -205 106 255 -222 106 255 -238 106 255 -255 106 255 -255 123 246 -24 115 255 -57 123 255 -74 123 255 -90 123 255 -106 123 255 -131 131 255 -139 131 255 -156 131 255 -164 131 255 -180 131 255 -197 131 255 -213 131 255 -222 131 255 -238 131 255 -255 131 255 -255 139 246 -24 131 255 -57 131 255 -74 131 255 -90 139 255 -106 139 255 -131 139 255 -148 148 255 -156 148 255 -172 148 255 -189 148 255 -197 148 255 -213 148 255 -230 148 255 -238 148 255 -255 148 255 -255 156 246 -24 139 255 -57 148 255 -74 148 255 -90 156 255 -106 156 255 -131 156 255 -148 156 255 -164 164 255 -172 164 255 -189 164 255 -197 164 255 -213 164 255 -230 164 255 -238 164 255 -255 164 255 -255 172 246 -24 164 255 -57 164 255 -74 164 255 -90 172 255 -106 164 255 -131 172 255 -148 172 255 -164 172 255 -180 180 255 -189 180 255 -205 180 255 -213 180 255 -230 180 255 -238 180 255 -255 180 255 -255 205 255 -24 180 255 -57 180 255 -74 180 255 -90 180 255 -106 180 255 -131 180 255 -148 189 255 -164 189 255 -180 189 255 -205 205 255 -213 205 255 -222 205 255 -230 205 255 -246 205 255 -255 205 255 -255 222 255 -24 197 255 -57 197 255 -74 197 255 -90 197 255 -106 197 255 -131 197 255 -148 197 255 -164 205 255 -180 205 255 -205 213 255 -222 222 255 -230 222 255 -238 222 255 -246 222 255 -255 222 255 -255 238 255 -24 213 255 -57 213 255 -74 213 255 -90 213 255 -106 213 255 -131 213 255 -148 213 255 -164 213 255 -180 213 255 -205 222 255 -222 230 255 -238 238 255 -246 238 255 -246 238 255 -255 238 255 -255 255 255 -24 230 255 -57 230 255 -74 230 255 -90 222 255 -106 230 255 -131 230 255 -148 230 255 -164 230 255 -180 230 255 -205 238 255 -222 238 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -24 246 255 -57 246 255 -74 238 255 -90 238 255 -106 238 255 -131 238 255 -148 238 255 -164 238 255 -180 238 255 -205 246 255 -222 246 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -24 255 255 -57 255 255 -74 255 255 -90 255 255 -106 255 255 -131 255 255 -148 255 255 -164 255 255 -180 255 255 -205 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -57 255 238 -74 255 246 -90 255 246 -106 255 246 -123 255 246 -139 255 246 -156 255 246 -172 255 246 -205 255 246 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/63.pal b/graphics/misc/sunny_day/63.pal deleted file mode 100644 index 8cf52aa114..0000000000 --- a/graphics/misc/sunny_day/63.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -57 57 255 -65 57 255 -82 57 255 -90 57 255 -106 57 255 -123 57 255 -131 57 255 -148 57 255 -164 57 255 -172 57 255 -189 57 255 -197 57 255 -213 57 255 -230 57 255 -238 57 255 -255 57 255 -57 65 255 -74 74 255 -82 74 255 -98 74 255 -106 74 255 -123 74 255 -139 74 255 -148 74 255 -164 74 255 -180 74 255 -189 74 255 -205 74 255 -222 74 255 -230 74 255 -246 74 255 -255 74 255 -57 82 255 -74 90 255 -90 90 255 -98 90 255 -115 90 255 -123 90 255 -139 90 255 -148 90 255 -164 90 255 -180 90 255 -189 90 255 -205 90 255 -213 90 255 -230 90 255 -246 90 255 -255 90 255 -57 98 255 -74 98 255 -90 106 255 -106 106 255 -115 106 255 -131 106 255 -148 106 255 -156 106 255 -164 106 255 -180 106 255 -189 106 255 -205 106 255 -222 106 255 -230 106 255 -246 106 255 -255 106 255 -57 106 255 -74 115 255 -90 115 255 -106 123 255 -123 123 255 -131 123 255 -148 123 255 -156 123 255 -172 123 255 -180 123 255 -197 123 255 -205 123 255 -222 123 255 -230 123 255 -246 123 255 -255 123 255 -57 123 255 -74 131 255 -90 131 255 -106 131 255 -123 139 255 -139 139 255 -148 139 255 -164 139 255 -172 139 255 -189 139 255 -197 139 255 -205 139 255 -222 139 255 -230 139 255 -246 139 255 -255 139 255 -57 139 255 -74 139 255 -90 139 255 -106 148 255 -123 148 255 -139 156 255 -156 156 255 -164 156 255 -180 156 255 -189 156 255 -205 156 255 -213 156 255 -222 156 255 -238 156 255 -246 156 255 -255 156 255 -57 148 255 -74 156 255 -90 156 255 -106 156 255 -123 164 255 -139 164 255 -156 172 255 -172 172 255 -180 172 255 -197 172 255 -205 172 255 -213 172 255 -230 172 255 -238 172 255 -246 172 255 -255 172 255 -57 164 255 -74 164 255 -90 172 255 -106 172 255 -123 172 255 -139 172 255 -156 180 255 -172 189 255 -205 205 255 -205 205 255 -222 205 255 -222 205 255 -230 205 255 -238 205 255 -246 205 255 -255 205 255 -57 180 255 -74 180 255 -90 180 255 -106 180 255 -123 189 255 -139 189 255 -156 189 255 -172 197 255 -205 213 255 -222 222 255 -222 222 255 -230 222 255 -238 222 255 -246 222 255 -255 222 255 -255 222 255 -57 189 255 -74 197 255 -90 197 255 -106 197 255 -123 197 255 -139 197 255 -156 205 255 -172 205 255 -205 222 255 -222 222 255 -238 238 255 -238 238 255 -246 238 255 -246 238 255 -255 238 255 -255 238 255 -57 205 255 -74 205 255 -90 205 255 -106 205 255 -123 205 255 -139 213 255 -156 213 255 -172 213 255 -205 230 255 -222 230 255 -238 238 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -57 222 255 -74 222 255 -90 222 255 -106 222 255 -123 222 255 -139 222 255 -156 222 255 -172 230 255 -205 238 255 -222 238 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -57 230 255 -74 230 255 -90 230 255 -106 230 255 -123 230 255 -139 238 255 -156 238 255 -172 238 255 -205 246 255 -222 246 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -57 246 255 -74 246 255 -90 246 255 -106 246 255 -123 246 255 -139 246 255 -156 246 255 -172 246 255 -205 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -57 255 255 -74 255 255 -90 255 255 -106 255 255 -123 255 255 -139 255 255 -156 255 255 -172 255 255 -205 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/64.pal b/graphics/misc/sunny_day/64.pal deleted file mode 100644 index f516a8fee7..0000000000 --- a/graphics/misc/sunny_day/64.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 8 -24 8 8 -41 8 8 -57 8 8 -74 8 8 -90 8 8 -106 8 8 -180 0 0 -197 0 0 -213 0 0 -230 0 0 -255 0 0 -255 8 8 -255 24 24 -255 41 41 -255 65 65 -8 24 8 -24 24 8 -41 24 8 -57 24 8 -74 24 8 -90 24 8 -106 24 8 -180 24 0 -197 16 0 -213 16 0 -230 16 0 -255 16 0 -255 24 8 -255 41 24 -255 49 41 -255 74 65 -8 41 8 -24 41 8 -41 41 8 -57 41 8 -74 41 8 -90 41 8 -106 41 8 -180 49 0 -197 49 0 -213 41 0 -230 41 0 -255 41 0 -255 41 8 -255 57 24 -255 65 41 -255 90 65 -8 57 8 -24 57 8 -41 57 8 -57 57 8 -74 57 8 -90 57 8 -106 57 8 -180 74 0 -197 74 0 -213 65 0 -230 65 0 -255 65 0 -255 65 8 -255 74 24 -255 82 41 -255 98 65 -8 74 8 -24 74 8 -41 74 8 -57 74 8 -74 74 8 -90 74 8 -106 74 8 -180 98 0 -197 98 0 -213 90 0 -230 90 0 -255 82 0 -255 82 8 -255 90 24 -255 98 41 -255 115 65 -8 90 8 -24 90 8 -41 90 8 -57 90 8 -74 90 8 -90 90 8 -106 90 8 -180 123 0 -197 123 0 -213 115 0 -230 115 0 -255 106 0 -255 106 8 -255 106 24 -255 115 41 -255 123 65 -8 106 8 -24 106 8 -41 106 8 -57 106 8 -74 106 8 -90 106 8 -106 106 8 -180 156 0 -197 148 0 -213 139 0 -230 131 0 -255 131 0 -255 131 8 -255 131 24 -255 131 41 -255 139 65 -0 180 0 -24 180 0 -49 180 0 -74 180 0 -106 180 0 -131 180 0 -156 180 0 -180 180 0 -197 172 0 -213 164 0 -230 156 0 -255 156 0 -255 148 8 -255 148 24 -255 148 41 -255 156 65 -0 197 0 -24 197 0 -49 197 0 -74 197 0 -98 197 0 -123 197 0 -148 197 0 -172 197 0 -197 197 0 -213 189 0 -230 180 0 -255 180 0 -255 172 8 -255 164 24 -255 164 41 -255 164 65 -0 213 0 -24 213 0 -49 213 0 -65 213 0 -98 213 0 -123 213 0 -139 213 0 -172 213 0 -197 213 0 -213 213 0 -230 205 0 -255 197 0 -255 197 8 -255 180 24 -255 180 41 -255 180 65 -0 230 0 -16 230 0 -41 230 0 -65 230 0 -90 230 0 -115 230 0 -139 230 0 -164 230 0 -189 230 0 -213 230 0 -230 230 0 -255 222 0 -255 213 8 -255 197 24 -255 189 41 -255 189 65 -0 255 0 -24 255 0 -41 255 0 -65 255 0 -90 255 0 -115 255 0 -139 255 0 -156 255 0 -180 255 0 -205 255 0 -230 255 0 -255 255 0 -255 230 8 -255 222 24 -255 213 41 -255 205 65 -8 255 8 -24 255 8 -49 255 8 -65 255 8 -90 255 8 -106 255 8 -131 255 8 -156 255 8 -172 255 8 -197 255 8 -213 255 8 -238 255 8 -255 255 8 -255 238 24 -255 222 41 -255 213 65 -24 255 24 -41 255 24 -57 255 24 -74 255 24 -98 255 24 -115 255 24 -131 255 24 -156 255 24 -164 255 24 -189 255 24 -205 255 24 -222 255 24 -246 255 24 -255 255 24 -255 238 41 -255 230 65 -41 255 41 -57 255 41 -74 255 41 -90 255 41 -106 255 41 -123 255 41 -131 255 41 -148 255 41 -164 255 41 -180 255 41 -197 255 41 -213 255 41 -230 255 41 -246 255 41 -255 255 41 -255 246 65 -65 255 65 -82 255 65 -90 255 65 -106 255 65 -115 255 65 -131 255 65 -139 255 65 -156 255 65 -172 255 65 -180 255 65 -197 255 65 -205 255 65 -222 255 65 -230 255 65 -246 255 65 -255 255 65 diff --git a/graphics/misc/sunny_day/65.pal b/graphics/misc/sunny_day/65.pal deleted file mode 100644 index 23c42e13f0..0000000000 --- a/graphics/misc/sunny_day/65.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 24 -24 8 24 -41 8 24 -57 8 24 -74 8 24 -90 8 24 -106 8 24 -180 0 24 -197 0 24 -213 0 24 -230 0 16 -255 0 24 -255 8 24 -255 24 41 -255 41 57 -255 65 82 -8 24 24 -24 24 24 -41 24 24 -57 24 24 -74 24 24 -90 24 24 -156 16 16 -180 16 16 -197 16 16 -213 16 16 -238 8 8 -246 16 16 -246 32 32 -255 49 49 -255 65 65 -255 82 82 -8 41 24 -24 41 24 -41 41 24 -57 41 24 -74 41 24 -90 41 24 -156 49 16 -180 41 16 -197 41 16 -213 41 16 -238 32 8 -246 32 16 -246 49 32 -255 57 49 -255 82 65 -255 98 82 -8 57 24 -24 57 24 -41 57 24 -57 57 24 -74 57 24 -90 57 24 -156 74 16 -180 65 16 -197 65 16 -213 65 16 -238 57 8 -246 57 16 -246 65 32 -255 74 49 -255 98 65 -255 106 82 -8 74 24 -24 74 24 -41 74 24 -57 74 24 -74 74 24 -90 74 24 -156 98 16 -180 98 16 -197 90 16 -213 90 16 -238 82 8 -246 82 16 -246 90 32 -255 98 49 -255 106 65 -255 115 82 -8 90 24 -24 90 24 -41 90 24 -57 90 24 -74 90 24 -90 90 24 -156 131 16 -180 123 16 -197 115 16 -213 115 16 -238 106 8 -246 106 16 -246 106 32 -255 106 49 -255 123 65 -255 131 82 -8 106 24 -16 156 16 -49 156 16 -74 156 16 -106 156 16 -131 156 16 -156 156 16 -180 148 16 -197 139 16 -213 139 16 -238 131 8 -246 131 16 -246 131 32 -255 131 49 -255 139 65 -255 148 82 -0 180 24 -16 180 16 -41 180 16 -74 180 16 -98 180 16 -123 180 16 -148 180 16 -180 180 16 -197 172 16 -213 164 16 -238 156 8 -246 148 16 -246 148 32 -255 148 49 -255 156 65 -255 156 82 -0 197 16 -16 197 16 -41 197 16 -74 197 16 -90 197 16 -123 197 16 -148 197 16 -172 197 16 -197 197 16 -213 189 16 -238 180 8 -246 172 16 -246 164 32 -255 164 49 -255 172 65 -255 172 82 -0 213 16 -16 213 16 -41 213 16 -65 213 16 -90 213 16 -115 213 16 -139 213 16 -164 213 16 -189 213 16 -213 213 16 -238 213 8 -246 197 16 -246 189 32 -255 180 49 -255 180 65 -255 180 82 -0 230 16 -8 238 8 -32 238 8 -65 238 8 -82 238 8 -115 238 8 -139 238 8 -164 238 8 -189 238 8 -213 238 8 -238 238 8 -246 222 16 -246 205 32 -255 197 49 -255 197 65 -255 197 82 -0 255 16 -16 246 16 -41 246 16 -65 246 16 -82 246 16 -106 246 16 -131 246 16 -156 246 16 -180 246 16 -197 246 16 -222 246 16 -246 246 16 -246 230 32 -255 213 49 -255 213 65 -255 205 82 -8 255 24 -32 246 32 -49 246 32 -74 246 32 -90 246 32 -115 246 32 -131 246 32 -148 246 32 -172 246 32 -189 246 32 -205 246 32 -230 246 32 -246 246 32 -255 230 49 -255 230 65 -255 222 82 -24 255 41 -49 255 49 -65 255 49 -82 255 49 -98 255 49 -115 255 49 -131 255 49 -148 255 49 -164 255 49 -180 255 49 -197 255 49 -213 255 49 -238 255 49 -255 255 49 -255 246 65 -255 230 82 -41 255 49 -65 255 65 -82 255 65 -98 255 65 -115 255 65 -123 255 65 -139 255 65 -156 255 65 -172 255 65 -189 255 65 -197 255 65 -213 255 65 -230 255 65 -246 255 65 -255 255 65 -255 246 82 -65 255 74 -82 255 82 -98 255 82 -106 255 82 -123 255 82 -139 255 82 -148 255 82 -156 255 82 -172 255 82 -189 255 82 -197 255 82 -205 255 82 -222 255 82 -238 255 82 -246 255 82 -255 255 82 diff --git a/graphics/misc/sunny_day/66.pal b/graphics/misc/sunny_day/66.pal deleted file mode 100644 index 1a76a24d1b..0000000000 --- a/graphics/misc/sunny_day/66.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 41 -24 8 41 -41 8 41 -57 8 41 -74 8 41 -90 8 41 -106 8 41 -180 0 49 -197 0 49 -213 0 49 -230 0 41 -255 0 41 -255 8 49 -255 24 57 -255 41 74 -255 65 90 -8 24 41 -24 24 41 -41 24 41 -57 24 41 -74 24 41 -90 24 41 -156 16 49 -180 16 41 -197 16 41 -213 16 41 -238 8 32 -246 16 41 -246 32 49 -255 49 65 -255 65 82 -255 82 98 -8 41 41 -24 41 41 -41 41 41 -57 41 41 -74 41 41 -131 49 49 -156 41 41 -172 41 41 -197 32 32 -213 32 32 -222 41 41 -230 49 49 -238 65 65 -246 82 82 -255 82 82 -255 98 98 -8 57 41 -24 57 41 -41 57 41 -57 57 41 -74 57 41 -131 74 49 -156 74 41 -172 65 41 -197 57 32 -213 57 32 -222 57 41 -230 65 49 -238 74 65 -246 90 82 -255 98 82 -255 106 98 -8 74 41 -24 74 41 -41 74 41 -57 74 41 -74 74 41 -131 98 49 -156 98 41 -172 90 41 -197 82 32 -213 82 32 -222 82 41 -230 90 49 -238 90 65 -246 106 82 -255 106 82 -255 123 98 -8 90 41 -24 90 41 -49 131 49 -74 131 49 -106 131 49 -131 131 49 -156 123 41 -172 115 41 -197 115 32 -213 106 32 -222 106 41 -230 106 49 -238 115 65 -246 123 82 -255 123 82 -255 131 98 -8 106 41 -16 156 49 -41 156 41 -74 156 41 -98 156 41 -123 156 41 -156 156 41 -172 148 41 -197 139 32 -213 131 32 -222 131 41 -230 131 49 -238 131 65 -246 139 82 -255 139 82 -255 148 98 -0 180 49 -16 180 41 -41 172 41 -65 172 41 -90 172 41 -123 172 41 -148 172 41 -172 172 41 -197 164 32 -213 156 32 -222 156 41 -230 148 49 -238 148 65 -246 156 82 -255 156 82 -255 156 98 -0 197 49 -16 197 41 -32 197 32 -65 197 32 -90 197 32 -115 197 32 -139 197 32 -164 197 32 -197 197 32 -213 189 32 -222 180 41 -230 164 49 -238 164 65 -246 164 82 -255 172 82 -255 172 98 -0 213 41 -16 213 41 -32 213 32 -57 213 32 -90 213 32 -115 213 32 -139 213 32 -164 213 32 -189 213 32 -213 213 32 -222 197 41 -230 189 49 -238 180 65 -246 180 82 -255 180 82 -255 180 98 -0 230 41 -8 238 32 -41 222 41 -65 222 41 -82 222 41 -106 222 41 -131 222 41 -156 222 41 -180 222 41 -205 222 41 -222 222 41 -230 205 49 -238 197 65 -246 197 82 -255 197 82 -255 197 98 -0 255 41 -16 246 32 -49 230 49 -74 230 49 -90 230 49 -106 230 49 -131 230 49 -156 230 49 -172 230 49 -189 230 49 -213 230 49 -230 230 49 -238 213 65 -246 213 82 -255 213 82 -255 205 98 -8 255 41 -32 246 49 -65 238 65 -82 238 65 -98 238 65 -115 238 65 -131 238 65 -148 238 65 -164 238 65 -180 238 65 -197 238 65 -222 238 65 -238 238 65 -246 230 82 -255 230 82 -255 222 98 -24 255 57 -49 255 57 -82 246 82 -98 246 82 -106 246 82 -123 246 82 -139 246 82 -156 246 82 -172 246 82 -180 246 82 -197 246 82 -213 246 82 -230 246 82 -246 246 82 -255 238 82 -255 230 98 -41 255 65 -65 255 82 -82 255 82 -98 255 82 -115 255 82 -123 255 82 -139 255 82 -156 255 82 -172 255 82 -189 255 82 -197 255 82 -213 255 82 -230 255 82 -246 255 82 -255 255 82 -255 246 98 -65 255 90 -82 255 98 -98 255 98 -115 255 98 -123 255 98 -139 255 98 -148 255 98 -164 255 98 -172 255 98 -189 255 98 -197 255 98 -213 255 98 -222 255 98 -238 255 98 -246 255 98 -255 255 98 diff --git a/graphics/misc/sunny_day/67.pal b/graphics/misc/sunny_day/67.pal deleted file mode 100644 index d7eb5fe5f1..0000000000 --- a/graphics/misc/sunny_day/67.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 57 -24 8 57 -41 8 57 -57 8 57 -74 8 57 -90 8 57 -106 8 57 -180 0 74 -197 0 74 -213 0 65 -230 0 65 -255 0 65 -255 8 65 -255 24 74 -255 41 90 -255 65 106 -8 24 57 -24 24 57 -41 24 57 -57 24 57 -74 24 57 -90 24 57 -156 16 74 -180 16 74 -197 16 74 -213 16 65 -238 8 65 -246 16 65 -246 32 74 -255 49 82 -255 65 98 -255 82 106 -8 41 57 -24 41 57 -41 41 57 -57 41 57 -74 41 57 -131 49 74 -156 41 74 -172 41 65 -197 32 65 -213 32 57 -222 41 65 -230 49 74 -238 65 82 -246 82 98 -255 82 98 -255 98 115 -8 57 57 -24 57 57 -41 57 57 -57 57 57 -106 74 74 -131 65 65 -148 65 65 -172 57 57 -189 57 57 -205 57 57 -213 65 65 -222 74 74 -230 90 90 -246 98 98 -255 98 98 -255 115 115 -8 74 57 -24 74 57 -41 74 57 -74 106 74 -106 106 74 -131 98 65 -148 90 65 -172 90 57 -189 82 57 -205 82 57 -213 90 65 -222 90 74 -230 106 90 -246 106 98 -255 115 98 -255 123 115 -8 90 57 -24 90 57 -49 131 74 -65 131 65 -98 131 65 -131 131 65 -148 123 65 -172 115 57 -189 106 57 -205 106 57 -213 106 65 -222 115 74 -230 123 90 -246 123 98 -255 123 98 -255 139 115 -8 106 57 -16 156 74 -41 156 74 -65 148 65 -90 148 65 -123 148 65 -148 148 65 -172 139 57 -189 131 57 -205 131 57 -213 131 65 -222 131 74 -230 139 90 -246 139 98 -255 139 98 -255 156 115 -0 180 74 -16 180 65 -41 172 65 -57 172 57 -90 172 57 -115 172 57 -139 172 57 -172 172 57 -189 164 57 -205 156 57 -213 148 65 -222 148 74 -230 156 90 -246 156 98 -255 156 98 -255 164 115 -0 197 74 -16 197 65 -32 197 57 -57 189 57 -82 189 57 -106 189 57 -139 189 57 -164 189 57 -189 189 57 -205 180 57 -213 172 65 -222 164 74 -230 172 90 -246 172 98 -255 172 98 -255 172 115 -0 213 65 -16 213 65 -32 213 57 -57 205 57 -82 205 57 -106 205 57 -131 205 57 -156 205 57 -180 205 57 -205 205 57 -213 189 65 -222 180 74 -230 180 90 -246 180 98 -255 180 98 -255 189 115 -0 230 65 -8 238 57 -41 222 57 -65 213 65 -90 213 65 -115 213 65 -131 213 65 -156 213 65 -172 213 65 -197 213 65 -213 213 65 -222 197 74 -230 197 90 -246 197 98 -255 197 98 -255 197 115 -0 255 65 -16 246 57 -49 230 65 -74 222 74 -98 222 74 -115 222 74 -131 222 74 -148 222 74 -164 222 74 -180 222 74 -205 222 74 -222 222 74 -230 213 90 -246 213 98 -255 213 98 -255 205 115 -8 255 65 -32 246 65 -65 238 74 -90 230 90 -106 230 90 -123 230 90 -139 230 90 -156 230 90 -172 230 90 -189 230 90 -205 230 90 -213 230 90 -230 230 90 -246 230 98 -255 230 98 -255 222 115 -24 255 74 -49 255 74 -82 246 90 -98 246 98 -115 246 98 -123 246 98 -139 246 98 -156 246 98 -172 246 98 -189 246 98 -197 246 98 -213 246 98 -230 246 98 -246 246 98 -255 238 98 -255 230 115 -41 255 82 -65 255 98 -82 255 98 -98 255 98 -115 255 98 -131 255 98 -148 255 98 -156 255 98 -172 255 98 -189 255 98 -197 255 98 -213 255 98 -230 255 98 -246 255 98 -255 255 98 -255 246 115 -65 255 98 -82 255 106 -98 255 106 -115 255 115 -131 255 115 -139 255 115 -156 255 115 -164 255 115 -172 255 115 -189 255 115 -197 255 115 -213 255 115 -222 255 115 -238 255 115 -246 255 115 -255 255 115 diff --git a/graphics/misc/sunny_day/68.pal b/graphics/misc/sunny_day/68.pal deleted file mode 100644 index b325c14ad3..0000000000 --- a/graphics/misc/sunny_day/68.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 74 -24 8 74 -41 8 74 -57 8 74 -74 8 74 -90 8 74 -106 8 74 -180 0 106 -197 0 98 -213 0 98 -230 0 90 -255 0 90 -255 8 90 -255 24 98 -255 41 106 -255 65 115 -8 24 74 -24 24 74 -41 24 74 -57 24 74 -74 24 74 -90 24 74 -156 16 106 -180 16 98 -197 16 90 -213 16 90 -238 8 82 -246 16 82 -246 32 90 -255 49 98 -255 65 115 -255 82 123 -8 41 74 -24 41 74 -41 41 74 -57 41 74 -74 41 74 -131 49 106 -156 41 98 -172 41 90 -197 32 90 -213 32 90 -222 41 82 -230 49 90 -238 65 98 -246 82 106 -255 82 115 -255 98 123 -8 57 74 -24 57 74 -41 57 74 -74 74 106 -106 74 106 -131 65 98 -148 65 90 -172 57 90 -189 57 82 -205 57 82 -213 65 90 -222 74 98 -230 90 106 -246 98 115 -255 98 115 -255 115 131 -8 74 74 -24 74 74 -41 74 74 -74 106 106 -106 90 90 -123 90 90 -148 82 82 -164 82 82 -180 82 82 -197 90 90 -205 90 90 -213 106 106 -230 106 106 -246 115 115 -255 115 115 -255 131 131 -8 90 74 -24 90 74 -49 131 98 -65 131 98 -90 123 90 -123 123 90 -148 115 82 -164 106 82 -180 106 82 -197 106 90 -205 106 90 -213 123 106 -230 123 106 -246 131 115 -255 131 115 -255 148 131 -8 106 74 -16 156 98 -41 156 98 -65 148 90 -82 148 82 -115 148 82 -148 148 82 -164 139 82 -180 131 82 -197 131 90 -205 131 90 -213 139 106 -230 139 106 -246 139 115 -255 148 115 -255 156 131 -0 180 98 -16 180 98 -41 172 90 -57 172 90 -82 164 82 -106 164 82 -139 164 82 -164 164 82 -180 156 82 -197 148 90 -205 148 90 -213 156 106 -230 156 106 -246 156 115 -255 156 115 -255 164 131 -0 197 98 -16 197 90 -32 197 82 -57 189 82 -82 180 82 -106 180 82 -131 180 82 -156 180 82 -180 180 82 -197 172 90 -205 164 90 -213 172 106 -230 172 106 -246 172 115 -255 172 115 -255 180 131 -0 213 90 -16 213 90 -32 213 82 -57 205 82 -90 197 90 -106 197 90 -131 197 90 -148 197 90 -172 197 90 -197 197 90 -205 180 90 -213 180 106 -230 189 106 -246 189 115 -255 189 115 -255 189 131 -0 230 90 -8 238 82 -41 222 82 -65 213 90 -90 205 90 -115 205 90 -131 205 90 -148 205 90 -164 205 90 -189 205 90 -205 205 90 -213 197 106 -230 197 106 -246 197 115 -255 197 115 -255 197 131 -0 255 82 -16 246 82 -49 230 90 -74 222 90 -106 213 106 -123 213 106 -139 213 106 -156 213 106 -172 213 106 -189 213 106 -205 213 106 -213 213 106 -230 213 106 -246 213 115 -255 213 115 -255 213 131 -8 255 82 -32 246 90 -65 238 90 -90 230 106 -106 230 106 -123 230 106 -139 230 106 -156 230 106 -172 230 106 -189 230 106 -197 230 106 -213 230 106 -230 230 106 -246 230 115 -255 230 115 -255 222 131 -24 255 90 -49 255 98 -82 246 106 -98 246 106 -115 246 115 -131 246 115 -148 246 115 -156 246 115 -172 246 115 -189 246 115 -197 246 115 -213 246 115 -230 246 115 -246 246 115 -255 238 115 -255 230 131 -41 255 98 -65 255 106 -82 255 106 -98 255 115 -115 255 115 -131 255 115 -148 255 115 -164 255 115 -172 255 115 -189 255 115 -205 255 115 -213 255 115 -230 255 115 -246 255 115 -255 255 115 -255 246 131 -65 255 115 -82 255 115 -98 255 123 -115 255 123 -131 255 131 -148 255 131 -156 255 131 -172 255 131 -180 255 131 -189 255 131 -205 255 131 -213 255 131 -222 255 131 -238 255 131 -246 255 131 -255 255 131 diff --git a/graphics/misc/sunny_day/69.pal b/graphics/misc/sunny_day/69.pal deleted file mode 100644 index 0612a71823..0000000000 --- a/graphics/misc/sunny_day/69.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 90 -24 8 90 -41 8 90 -57 8 90 -74 8 90 -90 8 90 -106 8 90 -180 0 131 -197 0 123 -213 0 123 -230 0 115 -255 0 115 -255 8 106 -255 24 115 -255 41 123 -255 65 131 -8 24 90 -24 24 90 -41 24 90 -57 24 90 -74 24 90 -90 24 90 -156 16 131 -180 16 123 -197 16 123 -213 16 115 -238 8 115 -246 16 106 -246 32 115 -255 49 115 -255 65 123 -255 82 139 -8 41 90 -24 41 90 -49 49 131 -74 49 131 -98 49 131 -131 49 131 -156 41 123 -172 41 123 -197 32 115 -213 32 115 -222 41 106 -230 49 106 -238 65 115 -246 82 123 -255 82 123 -255 98 139 -8 57 90 -24 57 90 -49 74 131 -65 65 131 -98 65 131 -131 65 131 -148 65 123 -172 57 115 -189 57 106 -205 57 106 -213 65 115 -222 74 115 -230 90 123 -246 98 123 -255 98 131 -255 115 139 -8 74 90 -24 74 90 -49 106 131 -65 98 131 -90 90 123 -123 90 123 -148 82 115 -164 82 106 -180 82 106 -197 90 106 -205 90 115 -213 106 123 -230 106 123 -246 115 131 -255 115 131 -255 131 148 -8 90 90 -24 90 90 -49 131 131 -65 131 131 -90 123 123 -123 106 106 -148 106 106 -164 98 98 -172 106 106 -189 106 106 -205 123 123 -213 123 123 -230 123 123 -246 131 131 -255 139 139 -255 148 148 -8 106 90 -16 156 131 -41 156 123 -65 148 123 -82 148 115 -106 148 106 -148 148 106 -164 131 98 -172 131 106 -189 131 106 -205 139 123 -213 139 123 -230 139 123 -246 148 131 -255 148 139 -255 156 148 -0 180 123 -16 180 123 -41 172 115 -57 172 115 -82 164 106 -98 164 98 -131 164 98 -164 164 98 -172 148 106 -189 148 106 -205 156 123 -213 156 123 -230 156 123 -246 156 131 -255 164 139 -255 172 148 -0 197 123 -16 197 115 -32 197 115 -57 189 106 -82 180 106 -106 172 106 -131 172 106 -148 172 106 -172 172 106 -189 172 106 -205 172 123 -213 172 123 -230 172 123 -246 172 131 -255 172 139 -255 180 148 -0 213 115 -16 213 115 -32 213 106 -57 205 106 -90 197 106 -106 189 106 -131 189 106 -148 189 106 -172 189 106 -189 189 106 -205 189 123 -213 180 123 -230 189 123 -246 189 131 -255 189 139 -255 189 148 -0 230 115 -8 238 106 -41 222 106 -65 213 106 -90 205 106 -123 205 123 -139 205 123 -156 205 123 -172 205 123 -189 205 123 -205 205 123 -213 197 123 -230 197 123 -246 197 131 -255 205 139 -255 205 148 -0 255 106 -16 246 106 -49 230 106 -74 222 115 -106 213 123 -123 213 123 -139 213 123 -156 213 123 -172 213 123 -189 213 123 -205 213 123 -213 213 123 -230 213 123 -246 213 131 -255 213 139 -255 213 148 -8 255 106 -32 246 106 -65 238 115 -90 230 123 -106 230 123 -123 230 123 -139 230 123 -156 230 123 -172 230 123 -189 230 123 -205 230 123 -213 230 123 -230 230 123 -246 230 131 -255 230 139 -255 222 148 -24 255 106 -49 255 106 -82 246 123 -98 246 123 -115 246 131 -131 246 131 -148 246 131 -156 246 131 -172 246 131 -189 246 131 -205 246 131 -213 246 131 -230 246 131 -246 246 131 -255 238 139 -255 238 148 -41 255 115 -65 255 123 -82 255 123 -98 255 123 -115 255 131 -139 255 139 -148 255 139 -164 255 139 -172 255 139 -189 255 139 -205 255 139 -213 255 139 -230 255 139 -246 255 139 -255 255 139 -255 246 148 -65 255 123 -82 255 131 -98 255 131 -115 255 139 -131 255 148 -148 255 148 -164 255 148 -172 255 148 -180 255 148 -197 255 148 -205 255 148 -213 255 148 -230 255 148 -238 255 148 -246 255 148 -255 255 148 diff --git a/graphics/misc/sunny_day/7.pal b/graphics/misc/sunny_day/7.pal deleted file mode 100644 index 0aa3396689..0000000000 --- a/graphics/misc/sunny_day/7.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 139 -16 0 139 -41 0 139 -57 0 139 -74 0 139 -98 0 139 -115 0 139 -139 0 139 -156 0 139 -172 0 131 -189 0 131 -205 0 131 -222 0 131 -238 0 131 -255 0 131 -255 24 131 -0 24 139 -16 16 131 -41 16 131 -57 16 131 -74 16 131 -98 16 131 -115 16 131 -131 16 131 -156 16 131 -172 16 131 -189 16 131 -205 16 131 -222 16 131 -238 16 131 -246 32 131 -255 41 139 -0 41 139 -16 41 131 -41 41 131 -57 41 131 -74 41 131 -90 41 131 -115 41 131 -131 41 131 -148 32 131 -172 32 131 -189 32 131 -205 32 131 -222 32 131 -230 49 139 -246 49 131 -255 57 131 -0 57 139 -16 57 131 -41 57 131 -57 57 131 -74 57 131 -90 57 131 -115 57 131 -131 57 131 -148 57 131 -164 57 131 -189 49 131 -205 57 131 -213 65 131 -230 65 131 -246 65 131 -255 74 139 -0 82 139 -16 74 131 -41 74 131 -57 74 131 -74 74 131 -90 74 131 -115 74 131 -131 74 131 -148 74 131 -164 74 131 -180 74 131 -197 82 131 -213 82 131 -230 82 131 -246 82 131 -255 90 139 -0 98 139 -16 98 131 -41 98 131 -57 90 131 -74 90 131 -90 90 131 -115 90 131 -131 90 131 -148 90 131 -164 90 131 -180 98 131 -197 98 131 -213 98 139 -230 98 131 -246 106 139 -255 106 139 -0 115 139 -16 115 131 -41 115 131 -57 115 131 -74 115 131 -90 115 131 -106 106 131 -131 106 131 -148 106 131 -164 115 131 -180 115 131 -197 115 131 -213 115 131 -230 123 139 -246 123 139 -255 123 139 -0 139 139 -16 131 131 -41 131 131 -57 131 131 -74 131 131 -90 131 131 -106 131 131 -131 131 131 -148 131 131 -164 131 131 -180 139 139 -197 131 131 -213 139 139 -230 139 139 -246 139 139 -255 139 139 -0 156 131 -16 156 131 -32 148 131 -57 148 131 -74 148 131 -90 148 131 -106 148 131 -131 148 131 -148 148 131 -164 148 131 -180 148 139 -197 148 131 -213 148 139 -230 148 139 -246 156 139 -255 156 139 -0 172 131 -16 172 131 -32 172 131 -57 164 131 -74 164 131 -90 164 131 -115 164 131 -131 164 131 -148 164 131 -164 164 131 -180 164 139 -197 164 131 -213 164 139 -230 164 139 -246 172 139 -255 172 139 -0 189 131 -16 189 131 -32 189 131 -49 189 131 -74 180 131 -98 180 131 -115 180 131 -139 180 139 -148 180 139 -164 180 139 -180 180 139 -197 180 131 -213 180 139 -230 180 139 -246 180 139 -255 189 139 -0 205 123 -16 205 123 -32 205 131 -57 205 131 -82 197 131 -98 197 131 -115 197 131 -131 197 131 -148 197 131 -164 197 131 -180 197 131 -197 197 131 -213 197 139 -230 197 139 -246 197 139 -255 197 139 -0 222 123 -16 222 123 -32 222 131 -65 213 131 -82 213 131 -98 213 131 -115 213 131 -139 213 139 -156 213 139 -164 213 139 -180 213 139 -197 213 139 -213 213 139 -230 213 139 -246 213 139 -255 213 139 -0 238 131 -16 238 131 -49 230 131 -65 230 131 -82 230 131 -98 230 131 -123 230 131 -139 230 139 -156 230 139 -164 230 139 -180 230 139 -197 230 139 -213 230 139 -230 230 139 -246 230 139 -255 230 139 -0 255 131 -32 246 131 -49 246 131 -65 246 131 -82 246 131 -106 246 131 -123 246 131 -139 246 139 -156 246 139 -172 246 139 -189 246 139 -205 246 139 -213 246 139 -230 246 139 -246 246 139 -255 246 139 -24 255 131 -41 255 131 -57 255 131 -74 255 131 -90 255 139 -106 255 139 -123 255 139 -139 255 139 -156 255 139 -172 255 139 -189 255 139 -197 255 139 -213 255 139 -230 255 139 -246 255 139 -255 255 139 diff --git a/graphics/misc/sunny_day/70.pal b/graphics/misc/sunny_day/70.pal deleted file mode 100644 index 7c949a9ece..0000000000 --- a/graphics/misc/sunny_day/70.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 106 -24 8 106 -41 8 106 -57 8 106 -74 8 106 -90 8 106 -106 8 106 -180 0 156 -197 0 148 -213 0 139 -230 0 139 -255 0 139 -255 8 131 -255 24 131 -255 41 131 -255 65 139 -8 24 106 -16 16 156 -49 16 156 -74 16 156 -98 16 156 -131 16 156 -156 16 156 -180 16 148 -197 16 148 -213 16 139 -238 8 139 -246 16 131 -246 32 131 -255 49 131 -255 65 139 -255 82 148 -8 41 106 -16 49 156 -41 41 156 -74 41 156 -98 41 156 -123 41 156 -156 41 156 -172 41 148 -197 32 139 -213 32 139 -222 41 131 -230 49 131 -238 65 131 -246 82 139 -255 82 139 -255 98 148 -8 57 106 -16 74 156 -41 74 156 -65 65 148 -90 65 148 -123 65 148 -148 65 148 -172 57 139 -189 57 139 -205 57 131 -213 65 131 -222 74 131 -230 90 139 -246 98 139 -255 98 148 -255 115 156 -8 74 106 -16 106 156 -41 98 156 -65 90 148 -82 82 148 -115 82 148 -148 82 148 -164 82 139 -180 82 131 -197 90 131 -205 90 131 -213 106 139 -230 106 139 -246 115 148 -255 115 148 -255 131 156 -8 90 106 -16 131 156 -41 123 156 -65 123 148 -82 115 148 -106 106 148 -148 106 148 -164 98 131 -172 106 131 -189 106 131 -205 123 139 -213 123 139 -230 123 139 -246 131 148 -255 139 148 -255 148 164 -8 106 106 -16 156 156 -41 156 156 -65 148 148 -82 148 148 -106 148 148 -139 123 123 -156 123 123 -172 123 123 -189 139 139 -205 139 139 -213 139 139 -230 148 148 -246 148 148 -255 156 156 -255 164 164 -0 180 156 -16 180 148 -41 172 148 -57 172 139 -82 164 139 -98 164 131 -123 156 123 -156 156 123 -172 148 123 -189 156 139 -205 156 139 -213 156 139 -230 156 148 -246 164 148 -255 164 156 -255 180 164 -0 197 148 -16 197 139 -32 197 139 -57 189 131 -82 180 131 -106 172 131 -123 172 123 -148 172 123 -172 172 123 -189 172 139 -205 172 139 -213 172 139 -230 172 148 -246 172 148 -255 180 156 -255 189 164 -0 213 139 -16 213 139 -32 213 131 -57 205 131 -90 197 131 -106 189 131 -139 189 139 -156 189 139 -172 189 139 -189 189 139 -205 189 139 -213 189 139 -230 189 148 -246 189 148 -255 189 156 -255 197 164 -0 230 131 -8 238 131 -41 222 131 -65 213 131 -90 205 131 -123 205 139 -139 205 139 -156 205 139 -172 205 139 -189 205 139 -205 205 139 -213 197 139 -230 197 148 -246 205 148 -255 205 156 -255 205 164 -0 255 131 -16 246 131 -49 230 131 -74 222 131 -106 213 139 -123 213 139 -139 213 139 -156 213 139 -172 213 139 -189 213 139 -205 213 139 -213 213 139 -230 213 148 -246 213 148 -255 213 156 -255 222 164 -8 255 131 -32 246 131 -65 238 131 -90 230 139 -106 230 139 -123 230 139 -148 230 148 -156 230 148 -172 230 148 -189 230 148 -205 230 148 -213 230 148 -230 230 148 -246 230 148 -255 230 156 -255 230 164 -24 255 131 -49 255 131 -82 246 139 -98 246 139 -115 246 139 -131 246 148 -148 246 148 -164 246 148 -180 246 148 -189 246 148 -205 246 148 -213 246 148 -230 246 148 -246 246 148 -255 238 156 -255 238 164 -41 255 131 -65 255 139 -82 255 139 -98 255 139 -115 255 148 -139 255 148 -156 255 156 -164 255 156 -180 255 156 -189 255 156 -205 255 156 -222 255 156 -230 255 156 -246 255 156 -255 255 156 -255 246 164 -65 255 139 -82 255 148 -98 255 148 -115 255 156 -131 255 156 -148 255 156 -164 255 164 -180 255 164 -189 255 164 -197 255 164 -205 255 164 -222 255 164 -230 255 164 -238 255 164 -246 255 164 -255 255 164 diff --git a/graphics/misc/sunny_day/71.pal b/graphics/misc/sunny_day/71.pal deleted file mode 100644 index 3e7ca23680..0000000000 --- a/graphics/misc/sunny_day/71.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 180 -24 0 180 -49 0 180 -74 0 180 -98 0 180 -123 0 180 -156 0 180 -180 0 180 -197 0 172 -213 0 172 -230 0 164 -255 0 156 -255 8 156 -255 24 156 -255 41 148 -255 65 156 -0 24 180 -16 16 180 -41 16 180 -65 16 180 -98 16 180 -123 16 180 -148 16 180 -180 16 180 -197 16 172 -213 16 164 -238 8 164 -246 16 156 -246 32 148 -255 49 148 -255 65 156 -255 82 156 -0 49 180 -16 41 180 -41 41 172 -65 41 172 -90 41 172 -115 41 172 -148 41 172 -172 41 172 -197 32 164 -213 32 164 -222 41 156 -230 49 156 -238 65 148 -246 82 156 -255 82 156 -255 98 164 -0 74 180 -16 74 180 -41 65 172 -57 57 172 -90 57 172 -115 57 172 -139 57 172 -172 57 172 -189 57 164 -205 57 156 -213 65 156 -222 74 148 -230 90 156 -246 98 156 -255 98 156 -255 115 164 -0 106 180 -16 98 180 -41 90 172 -57 90 172 -82 82 164 -106 82 164 -139 82 164 -164 82 164 -180 82 156 -197 90 148 -205 90 148 -213 106 156 -230 106 156 -246 115 156 -255 115 164 -255 131 172 -0 131 180 -16 123 180 -41 123 172 -57 115 172 -82 106 164 -98 98 164 -131 98 164 -164 98 164 -172 106 148 -189 106 148 -205 123 156 -213 123 156 -230 123 156 -246 131 156 -255 139 164 -255 148 172 -0 156 180 -16 148 180 -41 148 172 -57 139 172 -82 139 164 -98 131 164 -123 123 156 -156 123 156 -172 123 148 -189 139 156 -205 139 156 -213 139 156 -230 148 156 -246 148 164 -255 156 164 -255 164 180 -0 180 180 -16 180 180 -41 172 172 -57 172 172 -82 164 164 -98 164 164 -123 156 156 -156 139 139 -172 148 148 -189 148 148 -205 156 156 -222 156 156 -230 164 164 -246 164 164 -255 172 172 -255 180 180 -0 197 172 -16 197 172 -32 197 164 -57 189 164 -82 180 156 -106 172 148 -123 172 148 -148 172 148 -172 172 148 -189 172 148 -205 172 156 -222 172 156 -230 172 164 -246 180 164 -255 180 172 -255 197 180 -0 213 164 -16 213 164 -32 213 156 -57 205 156 -90 197 148 -106 189 148 -139 189 156 -148 189 148 -172 189 148 -189 189 148 -205 189 156 -222 189 156 -230 189 164 -246 189 164 -255 197 172 -255 205 180 -0 230 156 -8 238 156 -41 222 156 -65 213 148 -90 205 148 -123 205 156 -139 205 156 -156 205 156 -172 205 156 -189 205 156 -205 205 156 -222 205 156 -230 205 164 -246 205 164 -255 205 172 -255 213 180 -0 255 156 -16 246 148 -49 230 148 -74 222 148 -106 213 156 -123 213 156 -139 213 156 -156 222 156 -172 222 156 -189 222 156 -205 222 156 -222 222 156 -230 213 164 -246 213 164 -255 222 172 -255 222 180 -8 255 148 -32 246 148 -65 238 148 -90 230 156 -106 230 156 -123 230 156 -148 230 156 -164 230 164 -172 230 164 -189 230 164 -205 230 164 -213 230 164 -230 230 164 -246 230 164 -255 230 172 -255 230 180 -24 255 148 -49 255 148 -82 246 156 -98 246 156 -115 246 156 -131 246 156 -148 246 164 -164 246 164 -180 246 164 -189 246 164 -205 246 164 -213 246 164 -230 246 164 -246 246 164 -255 246 172 -255 238 180 -41 255 148 -65 255 156 -82 255 156 -98 255 156 -115 255 156 -139 255 164 -156 255 164 -172 255 172 -180 255 172 -197 255 172 -205 255 172 -222 255 172 -230 255 172 -246 255 172 -255 255 172 -255 246 180 -65 255 156 -82 255 156 -98 255 156 -115 255 164 -131 255 164 -148 255 172 -164 255 180 -180 255 180 -197 255 180 -205 255 180 -213 255 180 -222 255 180 -230 255 180 -238 255 180 -246 255 180 -255 255 180 diff --git a/graphics/misc/sunny_day/72.pal b/graphics/misc/sunny_day/72.pal deleted file mode 100644 index e5109a1148..0000000000 --- a/graphics/misc/sunny_day/72.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 197 -16 0 197 -49 0 197 -74 0 197 -98 0 197 -123 0 197 -148 0 197 -172 0 197 -197 0 197 -213 0 197 -230 0 189 -255 0 180 -255 8 172 -255 24 164 -255 41 164 -255 65 172 -0 24 197 -16 16 197 -41 16 197 -65 16 197 -90 16 197 -115 16 197 -139 16 197 -172 16 197 -197 16 197 -213 16 189 -238 8 189 -246 16 180 -246 32 172 -255 49 164 -255 65 172 -255 82 172 -0 49 197 -16 41 197 -32 32 197 -57 32 197 -82 32 197 -115 32 197 -139 32 197 -164 32 197 -197 32 197 -213 32 189 -222 41 180 -230 49 172 -238 65 164 -246 82 172 -255 82 172 -255 98 172 -0 74 197 -16 74 197 -32 65 197 -57 57 189 -82 57 189 -106 57 189 -131 57 189 -164 57 189 -189 57 189 -205 57 180 -213 65 172 -222 74 164 -230 90 172 -246 98 172 -255 98 172 -255 115 172 -0 98 197 -16 90 197 -32 90 197 -57 82 189 -82 82 180 -106 82 180 -131 82 180 -156 82 180 -180 82 180 -197 90 172 -205 90 164 -213 106 172 -230 106 172 -246 115 172 -255 115 172 -255 131 180 -0 123 197 -16 123 197 -32 115 197 -57 106 189 -82 106 180 -106 106 172 -131 106 172 -148 106 172 -172 106 172 -189 106 172 -205 123 172 -213 123 172 -230 123 172 -246 131 172 -255 139 172 -255 148 180 -0 148 197 -16 148 197 -32 139 197 -57 139 189 -82 131 180 -106 131 172 -123 123 172 -148 123 172 -172 123 172 -189 139 172 -205 139 172 -213 139 172 -230 148 172 -246 148 180 -255 156 180 -255 164 189 -0 172 197 -16 172 197 -32 164 197 -57 164 189 -82 156 180 -106 148 172 -123 148 172 -148 148 172 -172 148 172 -189 148 172 -205 156 172 -222 156 172 -230 164 172 -246 164 180 -255 172 180 -255 180 197 -0 197 197 -16 197 197 -32 197 197 -57 189 189 -82 180 180 -106 172 172 -123 172 172 -148 172 172 -180 164 164 -189 164 164 -205 172 172 -222 172 172 -230 180 180 -246 180 180 -255 189 189 -255 213 213 -0 213 189 -16 213 189 -32 213 189 -57 205 180 -90 197 172 -106 189 172 -139 189 172 -148 189 172 -164 189 164 -189 189 164 -205 189 172 -222 189 172 -230 189 180 -246 197 180 -255 197 189 -255 222 213 -0 230 180 -8 238 180 -41 222 180 -65 213 172 -90 205 164 -123 205 172 -139 205 172 -156 205 172 -172 205 172 -189 205 172 -205 205 172 -222 205 172 -230 205 180 -246 205 180 -255 213 189 -255 222 213 -0 255 180 -16 246 172 -49 230 164 -74 222 164 -106 213 172 -123 213 172 -139 213 172 -156 222 172 -172 222 172 -189 222 172 -205 222 172 -222 222 172 -230 222 180 -246 222 180 -255 222 189 -255 230 213 -8 255 172 -32 246 164 -65 238 164 -90 230 172 -106 230 172 -123 230 172 -148 230 172 -164 230 172 -180 230 180 -189 230 180 -205 230 180 -222 230 180 -230 230 180 -246 230 180 -255 230 189 -255 238 213 -24 255 164 -49 255 164 -82 246 164 -98 246 172 -115 246 172 -131 246 172 -148 246 172 -164 246 180 -180 246 180 -197 246 180 -205 246 180 -222 246 180 -230 246 180 -246 246 180 -255 246 189 -255 246 213 -41 255 164 -65 255 172 -82 255 172 -98 255 172 -115 255 172 -139 255 172 -156 255 180 -172 255 180 -189 255 189 -197 255 189 -213 255 189 -222 255 189 -230 255 189 -246 255 189 -255 255 189 -255 255 213 -65 255 164 -82 255 172 -98 255 172 -115 255 172 -131 255 180 -148 255 180 -164 255 189 -180 255 197 -213 255 213 -222 255 213 -230 255 213 -230 255 213 -238 255 213 -246 255 213 -255 255 213 -255 255 213 diff --git a/graphics/misc/sunny_day/73.pal b/graphics/misc/sunny_day/73.pal deleted file mode 100644 index 07b6ba4658..0000000000 --- a/graphics/misc/sunny_day/73.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 213 -16 0 213 -41 0 213 -65 0 213 -90 0 213 -115 0 213 -139 0 213 -164 0 213 -189 0 213 -213 0 213 -230 0 213 -255 0 205 -255 8 197 -255 24 189 -255 41 180 -255 65 180 -0 24 213 -16 16 213 -41 16 213 -65 16 213 -90 16 213 -115 16 213 -139 16 213 -164 16 213 -189 16 213 -213 16 213 -238 8 213 -246 16 197 -246 32 189 -255 49 180 -255 65 189 -255 82 189 -0 49 213 -16 41 213 -32 32 213 -57 32 213 -82 32 213 -106 32 213 -131 32 213 -156 32 213 -189 32 213 -213 32 213 -222 41 205 -230 49 189 -238 65 180 -246 82 180 -255 82 189 -255 98 189 -0 65 213 -16 65 213 -32 57 213 -57 57 205 -82 57 205 -106 57 205 -131 57 205 -156 57 205 -180 57 205 -205 57 205 -213 65 197 -222 74 180 -230 90 189 -246 98 189 -255 98 189 -255 115 189 -0 98 213 -16 90 213 -32 90 213 -57 82 205 -90 90 197 -106 90 197 -131 90 197 -148 90 197 -172 90 197 -197 90 197 -205 90 189 -213 106 189 -230 106 189 -246 115 189 -255 115 189 -255 131 189 -0 123 213 -16 115 213 -32 115 213 -57 106 205 -90 106 197 -106 106 189 -131 106 189 -148 106 189 -172 106 189 -189 106 189 -205 123 189 -213 123 189 -230 123 189 -246 131 189 -255 139 189 -255 148 197 -0 139 213 -16 139 213 -32 139 213 -57 131 205 -90 131 197 -106 131 189 -139 139 189 -156 139 189 -172 139 189 -189 139 189 -205 139 189 -213 139 189 -230 148 189 -246 148 189 -255 156 189 -255 164 197 -0 172 213 -16 164 213 -32 164 213 -57 156 205 -90 148 197 -106 148 189 -139 156 189 -148 148 189 -172 148 189 -189 148 189 -205 156 189 -222 156 189 -230 164 189 -246 164 189 -255 172 197 -255 180 205 -0 197 213 -16 189 213 -32 189 213 -57 180 205 -90 172 197 -106 172 189 -139 172 189 -148 172 189 -164 164 189 -189 164 189 -205 172 189 -222 172 189 -230 180 189 -246 180 197 -255 189 197 -255 213 222 -0 213 213 -16 213 213 -32 213 213 -57 205 205 -90 197 197 -106 189 189 -139 189 189 -148 189 189 -164 189 189 -197 180 180 -205 189 189 -222 189 189 -230 197 197 -246 197 197 -255 213 213 -255 230 230 -0 230 205 -8 238 213 -41 222 197 -65 213 189 -90 205 180 -123 205 189 -139 205 189 -156 205 189 -172 205 189 -189 205 189 -205 205 189 -222 205 189 -230 205 197 -246 213 197 -255 222 213 -255 230 230 -0 255 197 -16 246 197 -49 230 189 -74 222 180 -106 213 180 -123 213 180 -139 213 189 -156 222 189 -172 222 189 -189 222 189 -205 222 189 -222 222 189 -230 222 197 -246 222 197 -255 230 213 -255 238 230 -8 255 197 -32 246 189 -65 238 180 -90 230 180 -106 230 189 -123 230 189 -148 230 189 -164 230 189 -180 230 189 -197 230 197 -205 230 197 -222 230 197 -230 230 197 -246 230 197 -255 238 213 -255 246 230 -24 255 180 -49 255 180 -82 246 180 -98 246 180 -115 246 189 -131 246 189 -148 246 189 -164 246 189 -180 246 197 -197 246 197 -213 246 197 -222 246 197 -230 246 197 -246 246 197 -255 246 213 -255 246 230 -41 255 180 -65 255 180 -82 255 180 -98 255 180 -115 255 189 -139 255 189 -156 255 189 -172 255 197 -189 255 197 -213 255 213 -222 255 213 -230 255 213 -238 255 213 -246 255 213 -255 255 213 -255 255 230 -65 255 180 -82 255 180 -98 255 180 -115 255 189 -131 255 189 -148 255 189 -164 255 197 -180 255 205 -213 255 222 -230 255 230 -230 255 230 -238 255 230 -246 255 230 -246 255 230 -255 255 230 -255 255 230 diff --git a/graphics/misc/sunny_day/74.pal b/graphics/misc/sunny_day/74.pal deleted file mode 100644 index f77fe05344..0000000000 --- a/graphics/misc/sunny_day/74.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 230 -16 0 230 -41 0 230 -65 0 230 -90 0 230 -115 0 230 -131 0 230 -156 0 230 -180 0 230 -205 0 230 -230 0 230 -255 0 230 -255 8 213 -255 24 205 -255 41 197 -255 65 197 -0 16 230 -8 8 238 -32 8 238 -57 8 238 -82 8 238 -106 8 238 -131 8 238 -156 8 238 -180 8 238 -213 8 238 -238 8 238 -246 16 222 -246 32 205 -255 49 197 -255 65 197 -255 82 197 -0 41 230 -8 32 238 -41 41 222 -57 41 222 -82 41 222 -106 41 222 -131 41 222 -156 41 222 -180 41 222 -197 41 222 -222 41 222 -230 49 213 -238 65 197 -246 82 197 -255 82 197 -255 98 197 -0 65 230 -8 65 238 -41 65 222 -65 65 213 -90 65 213 -106 65 213 -131 65 213 -148 65 213 -172 65 213 -189 65 213 -213 65 213 -222 74 205 -230 90 205 -246 98 197 -255 98 197 -255 115 197 -0 90 230 -8 82 238 -41 82 222 -65 90 213 -90 90 205 -106 90 205 -131 90 205 -148 90 205 -164 90 205 -180 90 205 -205 90 205 -213 106 205 -230 106 197 -246 115 197 -255 115 205 -255 131 205 -0 115 230 -8 115 238 -41 106 222 -65 115 213 -90 115 205 -123 123 205 -139 123 205 -156 123 205 -172 123 205 -189 123 205 -205 123 205 -213 123 205 -230 123 205 -246 131 205 -255 139 205 -255 148 205 -0 139 230 -8 139 238 -41 131 222 -65 131 213 -90 131 205 -123 139 205 -139 139 205 -156 139 205 -172 139 205 -189 139 205 -205 139 205 -213 139 205 -230 148 205 -246 148 205 -255 156 205 -255 164 205 -0 164 230 -8 164 238 -41 156 222 -65 156 213 -90 148 205 -123 156 205 -139 156 205 -156 156 205 -172 156 205 -189 156 205 -205 156 205 -222 156 205 -230 164 205 -246 164 205 -255 172 205 -255 180 213 -0 189 230 -8 189 238 -41 180 222 -65 172 213 -90 164 205 -123 172 205 -139 172 205 -156 172 205 -172 172 205 -189 172 205 -205 172 205 -222 172 205 -230 180 205 -246 180 205 -255 189 213 -255 213 230 -0 213 230 -8 213 238 -41 205 222 -65 197 213 -90 189 205 -123 189 205 -139 189 205 -156 189 205 -172 189 205 -189 189 205 -205 189 205 -222 189 205 -230 197 205 -246 197 213 -255 213 222 -255 230 230 -0 230 230 -8 238 238 -41 222 222 -65 213 213 -90 205 205 -123 205 205 -139 205 205 -156 205 205 -172 205 205 -189 205 205 -205 197 197 -222 205 205 -238 205 205 -246 222 222 -255 230 230 -255 246 246 -0 255 222 -16 246 222 -49 230 205 -74 222 197 -106 213 197 -123 213 197 -139 213 197 -156 222 205 -172 222 205 -189 222 205 -205 222 205 -222 222 205 -238 222 205 -246 230 222 -255 238 230 -255 246 246 -8 255 213 -32 246 205 -65 238 197 -90 230 197 -106 230 197 -123 230 197 -148 230 197 -164 230 205 -180 230 205 -197 230 205 -205 238 205 -222 238 205 -238 238 205 -246 238 222 -255 246 230 -255 255 246 -24 255 197 -49 255 197 -82 246 197 -98 246 197 -115 246 197 -131 246 197 -148 246 205 -164 246 205 -180 246 205 -197 246 213 -222 246 222 -230 246 222 -238 246 222 -246 246 222 -255 246 230 -255 255 246 -41 255 189 -65 255 197 -82 255 197 -98 255 197 -115 255 197 -139 255 205 -156 255 205 -172 255 205 -189 255 213 -213 255 222 -230 255 230 -238 255 230 -246 255 230 -246 255 230 -255 255 230 -255 255 246 -65 255 189 -82 255 197 -98 255 197 -115 255 197 -131 255 197 -148 255 205 -164 255 205 -180 255 213 -213 255 222 -230 255 230 -246 255 246 -246 255 246 -255 255 246 -255 255 246 -255 255 246 -255 255 246 diff --git a/graphics/misc/sunny_day/75.pal b/graphics/misc/sunny_day/75.pal deleted file mode 100644 index 98e07acb62..0000000000 --- a/graphics/misc/sunny_day/75.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 255 -16 0 255 -41 0 255 -65 0 255 -82 0 255 -106 0 255 -131 0 255 -156 0 255 -180 0 255 -197 0 255 -222 0 255 -255 0 255 -255 8 238 -255 24 222 -255 41 213 -255 65 205 -0 24 255 -16 16 246 -32 16 246 -57 16 246 -82 16 246 -106 16 246 -131 16 246 -148 16 246 -172 16 246 -197 16 246 -222 16 246 -246 16 246 -246 32 230 -255 49 213 -255 65 213 -255 82 205 -0 41 255 -16 41 246 -49 49 230 -65 49 230 -90 49 230 -106 49 230 -131 49 230 -148 49 230 -164 49 230 -189 49 230 -205 49 230 -230 49 230 -238 65 222 -246 82 213 -255 82 213 -255 98 213 -0 65 255 -16 65 246 -49 74 230 -74 74 222 -90 74 222 -115 74 222 -131 74 222 -148 74 222 -164 74 222 -180 74 222 -197 74 222 -222 74 222 -230 90 213 -246 98 213 -255 98 213 -255 115 213 -0 90 255 -16 82 246 -49 90 230 -74 98 222 -106 106 213 -123 106 213 -139 106 213 -156 106 213 -172 106 213 -180 106 213 -197 106 213 -213 106 213 -230 106 213 -246 115 213 -255 115 213 -255 131 213 -0 115 255 -16 106 246 -49 106 230 -74 115 222 -106 123 213 -123 123 213 -139 123 213 -156 123 213 -172 123 213 -180 123 213 -197 123 213 -213 123 213 -230 123 213 -246 131 213 -255 139 213 -255 148 213 -0 139 255 -16 131 246 -49 131 230 -74 131 222 -106 139 213 -123 139 213 -139 139 213 -156 139 213 -172 139 213 -189 139 213 -197 139 213 -213 139 213 -230 148 213 -246 148 213 -255 156 222 -255 164 222 -0 156 255 -16 156 246 -49 156 230 -74 148 222 -106 156 213 -123 156 213 -139 156 213 -156 156 222 -172 156 222 -189 156 222 -205 156 222 -222 156 222 -230 164 213 -246 164 213 -255 172 222 -255 180 222 -0 180 255 -16 180 246 -49 172 230 -74 164 222 -106 172 213 -123 172 213 -139 172 213 -156 172 222 -172 172 222 -189 172 222 -205 172 222 -222 172 222 -230 180 222 -246 180 222 -255 189 222 -255 213 230 -0 205 255 -16 197 246 -49 189 230 -74 180 222 -106 189 213 -123 189 213 -139 189 213 -156 189 222 -172 189 222 -189 189 222 -205 189 222 -222 189 222 -230 197 222 -246 197 222 -255 213 230 -255 230 238 -0 230 255 -16 222 246 -49 213 230 -74 205 222 -106 205 213 -123 205 213 -139 205 213 -156 205 222 -172 205 222 -189 205 222 -205 205 222 -222 205 222 -238 205 222 -246 222 230 -255 230 238 -255 246 246 -0 255 255 -16 246 246 -49 230 230 -74 222 222 -106 213 213 -123 213 213 -139 213 213 -156 222 222 -172 222 222 -189 222 222 -205 222 222 -222 222 222 -238 230 230 -246 238 238 -255 246 246 -255 255 255 -8 255 230 -32 246 230 -65 238 213 -90 230 213 -106 230 213 -123 230 213 -148 230 213 -164 230 213 -180 230 222 -197 230 222 -205 238 222 -230 238 230 -238 238 230 -246 246 238 -255 246 246 -255 255 255 -24 255 222 -49 255 213 -82 246 213 -98 246 213 -115 246 213 -131 246 213 -148 246 213 -164 246 213 -180 246 222 -197 246 222 -222 246 230 -238 246 238 -246 246 238 -246 246 238 -255 255 246 -255 255 255 -41 255 213 -65 255 213 -82 255 213 -98 255 213 -115 255 213 -139 255 213 -156 255 213 -172 255 222 -189 255 222 -213 255 230 -230 255 238 -246 255 246 -255 255 246 -255 255 246 -255 255 246 -255 255 255 -65 255 205 -82 255 205 -98 255 205 -115 255 205 -131 255 213 -148 255 213 -164 255 222 -180 255 222 -213 255 230 -230 255 238 -246 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/76.pal b/graphics/misc/sunny_day/76.pal deleted file mode 100644 index 4c9939c5e5..0000000000 --- a/graphics/misc/sunny_day/76.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 255 -24 8 255 -41 8 255 -65 8 255 -82 8 255 -106 8 255 -131 8 255 -148 8 255 -172 8 255 -197 8 255 -213 8 255 -230 8 255 -255 8 255 -255 24 246 -255 41 230 -255 65 222 -8 24 255 -32 32 246 -49 32 246 -65 32 246 -90 32 246 -106 32 246 -131 32 246 -148 32 246 -164 32 246 -189 32 246 -205 32 246 -230 32 246 -246 32 246 -255 49 238 -255 65 230 -255 82 222 -8 49 255 -32 49 246 -65 65 238 -74 65 238 -90 65 238 -115 65 238 -131 65 238 -148 65 238 -164 65 238 -180 65 238 -197 65 238 -213 65 238 -238 65 238 -246 82 230 -255 82 230 -255 98 222 -8 65 255 -32 74 246 -65 82 238 -90 90 230 -106 90 230 -123 90 230 -139 90 230 -156 90 230 -172 90 230 -180 90 230 -197 90 230 -213 90 230 -230 90 230 -246 98 230 -255 98 230 -255 115 222 -8 90 255 -32 90 246 -65 98 238 -90 106 230 -106 106 230 -123 106 230 -139 106 230 -156 106 230 -172 106 230 -189 106 230 -197 106 230 -213 106 230 -230 106 230 -246 115 230 -255 115 230 -255 131 222 -8 106 255 -32 115 246 -65 115 238 -90 123 230 -106 123 230 -123 123 230 -139 123 230 -156 123 230 -172 123 230 -189 123 230 -197 123 230 -213 123 230 -230 123 230 -246 131 230 -255 139 230 -255 148 230 -8 131 255 -32 131 246 -65 131 238 -90 139 230 -106 139 230 -123 139 230 -148 148 230 -156 148 230 -172 148 230 -189 148 230 -197 148 230 -213 148 230 -230 148 230 -246 148 230 -255 156 230 -255 164 230 -8 156 255 -32 148 246 -65 148 238 -90 156 230 -106 156 230 -123 156 230 -148 156 230 -164 164 230 -172 164 230 -189 164 230 -205 164 230 -213 164 230 -230 164 230 -246 164 230 -255 172 230 -255 180 230 -8 172 255 -32 172 246 -65 164 238 -90 172 230 -106 172 230 -123 172 230 -148 172 230 -164 172 230 -180 180 230 -189 180 230 -205 180 230 -222 180 230 -230 180 230 -246 180 230 -255 189 230 -255 213 238 -8 197 255 -32 189 246 -65 180 238 -90 189 230 -106 189 230 -123 189 230 -148 189 230 -164 189 230 -180 189 230 -197 197 230 -205 197 230 -222 197 230 -230 197 230 -246 197 230 -255 213 238 -255 230 246 -8 213 255 -32 205 246 -65 197 238 -90 205 230 -106 197 230 -123 205 230 -148 205 230 -164 205 230 -180 205 230 -197 205 230 -205 205 238 -222 205 238 -238 205 238 -246 222 238 -255 230 246 -255 246 255 -8 238 255 -32 230 246 -65 222 238 -90 213 230 -106 213 230 -123 213 230 -148 213 230 -164 213 230 -180 222 230 -197 222 230 -205 222 238 -230 230 238 -238 230 238 -246 238 246 -255 246 255 -255 255 255 -8 255 255 -32 246 246 -65 238 238 -90 230 230 -106 230 230 -123 230 230 -148 230 230 -164 230 230 -180 230 230 -197 230 230 -205 238 238 -230 238 238 -246 246 246 -255 246 246 -255 255 255 -255 255 255 -24 255 238 -49 255 230 -82 246 230 -98 246 230 -115 246 230 -131 246 230 -148 246 230 -164 246 230 -180 246 230 -197 246 230 -222 246 238 -238 246 246 -246 255 246 -255 255 246 -255 255 255 -255 255 255 -41 255 222 -65 255 230 -82 255 230 -98 255 230 -115 255 230 -139 255 230 -156 255 230 -172 255 230 -189 255 230 -213 255 238 -230 255 246 -246 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -65 255 213 -82 255 222 -98 255 222 -115 255 222 -131 255 222 -148 255 222 -164 255 230 -180 255 230 -213 255 238 -230 255 246 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/77.pal b/graphics/misc/sunny_day/77.pal deleted file mode 100644 index dbd7b65fdd..0000000000 --- a/graphics/misc/sunny_day/77.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -24 24 255 -41 24 255 -57 24 255 -74 24 255 -90 24 255 -106 24 255 -131 24 255 -148 24 255 -164 24 255 -180 24 255 -197 24 255 -222 24 255 -238 24 255 -255 24 255 -255 41 246 -255 65 230 -24 41 255 -49 49 255 -57 49 255 -74 49 255 -98 49 255 -106 49 255 -131 49 255 -148 49 255 -164 49 255 -180 49 255 -197 49 255 -213 49 255 -230 49 255 -255 49 255 -255 65 246 -255 82 238 -24 57 255 -49 65 255 -82 82 246 -90 82 246 -106 82 246 -123 82 246 -139 82 246 -156 82 246 -164 82 246 -180 82 246 -197 82 246 -213 82 246 -230 82 246 -246 82 246 -255 82 246 -255 98 238 -24 74 255 -49 82 255 -82 98 246 -98 98 246 -106 98 246 -123 98 246 -139 98 246 -156 98 246 -172 98 246 -180 98 246 -197 98 246 -213 98 246 -230 98 246 -246 98 246 -255 98 246 -255 115 238 -24 98 255 -49 98 255 -82 106 246 -98 115 246 -115 115 246 -131 115 246 -139 115 246 -156 115 246 -172 115 246 -189 115 246 -197 115 246 -213 115 246 -230 115 246 -246 115 246 -255 115 246 -255 131 238 -24 115 255 -49 115 255 -82 123 246 -98 123 246 -115 131 246 -131 131 246 -148 131 246 -156 131 246 -172 131 246 -189 131 246 -197 131 246 -213 131 246 -230 131 246 -246 131 246 -255 139 246 -255 148 238 -24 131 255 -49 131 255 -82 139 246 -98 139 246 -115 148 246 -131 148 246 -148 148 246 -164 148 246 -172 148 246 -189 148 246 -205 148 246 -213 148 246 -230 148 246 -246 148 246 -255 156 246 -255 164 238 -24 156 255 -49 148 255 -82 156 246 -98 156 246 -115 156 246 -131 156 246 -148 164 246 -164 164 246 -180 164 246 -189 164 246 -205 164 246 -213 164 246 -230 164 246 -246 164 246 -255 172 246 -255 180 238 -24 164 255 -49 164 255 -82 172 246 -98 172 246 -115 172 246 -131 172 246 -148 180 246 -164 180 246 -180 180 246 -197 180 246 -205 180 246 -222 180 246 -230 180 246 -246 180 246 -255 189 246 -255 213 246 -24 189 255 -49 180 255 -82 180 246 -98 189 246 -115 189 246 -131 189 246 -148 189 246 -164 189 246 -180 197 246 -197 197 246 -213 197 246 -222 197 246 -230 197 246 -246 197 246 -255 213 246 -255 230 246 -24 205 255 -49 197 255 -82 197 246 -98 197 246 -115 197 246 -131 205 246 -148 205 246 -164 205 246 -180 205 246 -197 213 246 -222 222 246 -230 222 246 -238 222 246 -246 222 246 -255 230 246 -255 246 255 -24 222 255 -49 213 255 -82 213 246 -98 213 246 -115 213 246 -131 213 246 -148 213 246 -164 213 246 -180 222 246 -197 222 246 -222 230 246 -238 238 246 -246 238 246 -246 238 246 -255 246 255 -255 255 255 -24 246 255 -49 238 255 -82 230 246 -98 230 246 -115 230 246 -131 230 246 -148 230 246 -164 230 246 -180 230 246 -197 230 246 -222 238 246 -238 246 246 -246 246 255 -255 246 255 -255 255 255 -255 255 255 -24 255 255 -49 255 255 -82 246 246 -98 246 246 -115 246 246 -131 246 246 -148 246 246 -164 246 246 -180 246 246 -197 246 246 -222 246 246 -238 246 246 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -41 255 238 -65 255 246 -82 255 238 -98 255 238 -115 255 238 -139 255 238 -156 255 238 -172 255 246 -189 255 246 -213 255 246 -230 255 246 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -65 255 230 -82 255 230 -98 255 230 -115 255 230 -131 255 230 -148 255 238 -164 255 238 -180 255 238 -213 255 246 -230 255 246 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/78.pal b/graphics/misc/sunny_day/78.pal deleted file mode 100644 index dcee38d729..0000000000 --- a/graphics/misc/sunny_day/78.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -41 41 255 -49 41 255 -65 41 255 -82 41 255 -98 41 255 -115 41 255 -131 41 255 -148 41 255 -164 41 255 -180 41 255 -189 41 255 -213 41 255 -222 41 255 -238 41 255 -255 41 255 -255 65 246 -41 57 255 -65 65 255 -82 65 255 -98 65 255 -106 65 255 -123 65 255 -139 65 255 -156 65 255 -172 65 255 -180 65 255 -197 65 255 -213 65 255 -230 65 255 -246 65 255 -255 65 255 -255 82 246 -41 74 255 -65 82 255 -82 82 255 -98 82 255 -106 82 255 -123 82 255 -139 82 255 -156 82 255 -172 82 255 -180 82 255 -197 82 255 -213 82 255 -230 82 255 -238 82 255 -255 82 255 -255 98 246 -41 90 255 -65 98 255 -82 98 255 -98 98 255 -115 98 255 -123 98 255 -139 98 255 -156 98 255 -172 98 255 -180 98 255 -197 98 255 -213 98 255 -230 98 255 -238 98 255 -255 98 255 -255 115 246 -41 106 255 -65 115 255 -82 115 255 -98 115 255 -115 115 255 -131 115 255 -148 115 255 -156 115 255 -172 115 255 -189 115 255 -197 115 255 -213 115 255 -230 115 255 -238 115 255 -255 115 255 -255 131 246 -41 123 255 -65 123 255 -82 123 255 -98 131 255 -115 131 255 -139 139 255 -148 139 255 -164 139 255 -172 139 255 -189 139 255 -205 139 255 -213 139 255 -230 139 255 -238 139 255 -255 139 255 -255 148 246 -41 131 255 -65 139 255 -82 139 255 -98 148 255 -115 148 255 -139 148 255 -156 156 255 -164 156 255 -180 156 255 -189 156 255 -205 156 255 -213 156 255 -230 156 255 -238 156 255 -255 156 255 -255 164 246 -41 148 255 -65 156 255 -82 156 255 -98 156 255 -115 164 255 -139 164 255 -156 164 255 -172 172 255 -180 172 255 -197 172 255 -205 172 255 -222 172 255 -230 172 255 -246 172 255 -255 172 255 -255 180 246 -41 164 255 -65 172 255 -82 172 255 -98 172 255 -115 172 255 -139 172 255 -156 180 255 -172 180 255 -189 189 255 -197 189 255 -213 189 255 -222 189 255 -230 189 255 -246 189 255 -255 189 255 -255 213 255 -41 180 255 -65 189 255 -82 189 255 -98 189 255 -115 189 255 -139 189 255 -156 189 255 -172 197 255 -189 197 255 -213 213 255 -222 213 255 -230 213 255 -238 213 255 -246 213 255 -255 213 255 -255 230 255 -41 197 255 -65 197 255 -82 197 255 -98 197 255 -115 205 255 -139 205 255 -156 205 255 -172 205 255 -189 213 255 -213 222 255 -230 230 255 -238 230 255 -246 230 255 -246 230 255 -255 230 255 -255 246 255 -41 213 255 -65 213 255 -82 213 255 -98 213 255 -115 213 255 -139 213 255 -156 222 255 -172 222 255 -189 222 255 -213 230 255 -230 238 255 -246 246 255 -246 246 255 -255 246 255 -255 246 255 -255 255 255 -41 230 255 -65 230 255 -82 230 255 -98 230 255 -115 230 255 -139 230 255 -156 230 255 -172 230 255 -189 230 255 -213 238 255 -230 246 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -41 246 255 -65 246 255 -82 246 255 -98 246 255 -115 246 255 -139 246 255 -156 246 255 -172 246 255 -189 246 255 -213 246 255 -230 246 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -41 255 255 -65 255 255 -82 255 255 -98 255 255 -115 255 255 -139 255 255 -156 255 255 -172 255 255 -189 255 255 -213 255 255 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -65 255 246 -82 255 246 -98 255 246 -115 255 246 -131 255 246 -148 255 246 -164 255 246 -180 255 246 -213 255 255 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/79.pal b/graphics/misc/sunny_day/79.pal deleted file mode 100644 index bbcd359c53..0000000000 --- a/graphics/misc/sunny_day/79.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -65 65 255 -74 65 255 -90 65 255 -98 65 255 -115 65 255 -123 65 255 -139 65 255 -156 65 255 -164 65 255 -180 65 255 -189 65 255 -205 65 255 -213 65 255 -230 65 255 -246 65 255 -255 65 255 -65 82 255 -82 82 255 -98 82 255 -106 82 255 -115 82 255 -131 82 255 -148 82 255 -156 82 255 -172 82 255 -180 82 255 -197 82 255 -205 82 255 -222 82 255 -230 82 255 -246 82 255 -255 82 255 -65 90 255 -82 98 255 -98 98 255 -106 98 255 -123 98 255 -131 98 255 -148 98 255 -156 98 255 -172 98 255 -180 98 255 -197 98 255 -205 98 255 -222 98 255 -230 98 255 -246 98 255 -255 98 255 -65 106 255 -82 106 255 -98 115 255 -115 115 255 -123 115 255 -139 115 255 -156 115 255 -164 115 255 -172 115 255 -189 115 255 -197 115 255 -205 115 255 -222 115 255 -230 115 255 -246 115 255 -255 115 255 -65 115 255 -82 123 255 -98 123 255 -115 131 255 -131 131 255 -148 131 255 -156 131 255 -164 131 255 -180 131 255 -189 131 255 -197 131 255 -213 131 255 -222 131 255 -230 131 255 -246 131 255 -255 131 255 -65 131 255 -82 139 255 -98 139 255 -115 139 255 -131 148 255 -148 148 255 -156 148 255 -172 148 255 -180 148 255 -189 148 255 -205 148 255 -213 148 255 -222 148 255 -238 148 255 -246 148 255 -255 148 255 -65 139 255 -82 148 255 -98 148 255 -115 156 255 -131 156 255 -148 164 255 -164 164 255 -180 164 255 -189 164 255 -197 164 255 -205 164 255 -222 164 255 -230 164 255 -238 164 255 -246 164 255 -255 164 255 -65 156 255 -82 156 255 -98 164 255 -115 164 255 -131 172 255 -148 172 255 -164 180 255 -180 180 255 -197 180 255 -205 180 255 -213 180 255 -222 180 255 -230 180 255 -238 180 255 -246 180 255 -255 180 255 -65 172 255 -82 172 255 -98 172 255 -115 172 255 -131 180 255 -148 180 255 -164 189 255 -180 197 255 -213 213 255 -222 213 255 -222 213 255 -230 213 255 -238 213 255 -246 213 255 -255 213 255 -255 213 255 -65 180 255 -82 189 255 -98 189 255 -115 189 255 -131 189 255 -148 197 255 -164 197 255 -180 205 255 -213 222 255 -230 230 255 -230 230 255 -238 230 255 -246 230 255 -246 230 255 -255 230 255 -255 230 255 -65 197 255 -82 197 255 -98 197 255 -115 197 255 -131 205 255 -148 205 255 -164 205 255 -180 213 255 -213 230 255 -230 230 255 -246 246 255 -246 246 255 -255 246 255 -255 246 255 -255 246 255 -255 246 255 -65 205 255 -82 205 255 -98 213 255 -115 213 255 -131 213 255 -148 213 255 -164 222 255 -180 222 255 -213 230 255 -230 238 255 -246 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -65 222 255 -82 222 255 -98 222 255 -115 222 255 -131 222 255 -148 230 255 -164 230 255 -180 230 255 -213 238 255 -230 246 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -65 230 255 -82 238 255 -98 238 255 -115 238 255 -131 238 255 -148 238 255 -164 238 255 -180 238 255 -213 246 255 -230 246 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -65 246 255 -82 246 255 -98 246 255 -115 246 255 -131 246 255 -148 246 255 -164 246 255 -180 246 255 -213 255 255 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -65 255 255 -82 255 255 -98 255 255 -115 255 255 -131 255 255 -148 255 255 -164 255 255 -180 255 255 -213 255 255 -230 255 255 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/8.pal b/graphics/misc/sunny_day/8.pal deleted file mode 100644 index 1d05da74e7..0000000000 --- a/graphics/misc/sunny_day/8.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 156 -16 0 156 -41 0 156 -57 0 156 -74 0 156 -98 0 156 -115 0 156 -131 0 156 -156 0 156 -172 0 156 -189 0 148 -205 0 148 -222 0 148 -238 0 148 -255 0 148 -255 24 148 -0 24 156 -16 16 156 -41 16 156 -57 16 156 -74 16 156 -98 16 156 -115 16 156 -131 16 156 -156 16 156 -172 16 156 -189 16 148 -205 16 148 -222 16 148 -238 16 148 -246 32 156 -255 41 148 -0 41 156 -16 41 156 -32 32 148 -57 32 148 -74 32 148 -90 32 148 -115 32 148 -131 32 148 -148 32 148 -172 32 148 -189 32 148 -205 32 148 -222 32 148 -230 49 148 -246 49 148 -255 57 156 -0 57 156 -16 57 156 -32 57 148 -57 57 148 -74 57 148 -90 57 148 -106 57 148 -131 57 148 -148 57 148 -164 57 148 -189 49 148 -205 57 148 -213 65 148 -230 65 148 -246 65 156 -255 74 156 -0 74 156 -16 74 156 -32 74 148 -57 74 148 -74 74 148 -90 74 148 -115 74 148 -131 74 148 -148 74 148 -164 74 148 -180 74 148 -197 82 148 -213 82 148 -230 82 148 -246 82 148 -255 90 156 -0 98 156 -16 98 156 -32 90 148 -57 90 148 -74 90 148 -90 90 148 -106 90 148 -131 90 148 -148 90 148 -164 90 148 -180 98 148 -197 98 148 -213 98 148 -230 98 156 -246 106 148 -255 106 156 -0 115 156 -16 115 156 -32 115 148 -57 115 148 -74 115 148 -90 106 148 -106 106 148 -131 106 148 -148 106 148 -164 115 148 -180 115 148 -197 115 148 -213 115 148 -230 123 156 -246 123 156 -255 123 156 -0 139 156 -16 131 156 -32 131 148 -57 131 148 -74 131 148 -90 131 148 -106 131 148 -131 131 148 -148 131 148 -164 131 148 -180 139 148 -197 131 148 -213 139 156 -230 139 156 -246 139 156 -255 139 156 -0 156 156 -16 156 156 -32 148 148 -57 148 148 -74 148 148 -90 148 148 -106 148 148 -131 148 148 -148 148 148 -164 148 148 -180 156 156 -197 148 148 -213 156 156 -230 156 156 -246 156 156 -255 172 172 -0 172 148 -16 172 148 -32 172 148 -57 164 148 -74 164 148 -90 164 148 -115 164 148 -131 164 148 -148 164 148 -164 164 148 -180 164 156 -197 164 148 -213 172 156 -230 164 156 -246 172 156 -255 180 172 -0 189 148 -16 189 148 -32 189 148 -49 189 148 -74 180 148 -98 180 148 -115 180 148 -139 180 148 -156 180 156 -164 180 156 -180 180 156 -197 180 148 -213 180 156 -230 180 156 -246 180 156 -255 197 172 -0 205 148 -16 205 148 -32 205 148 -57 205 148 -82 197 148 -98 197 148 -115 197 148 -131 197 148 -148 197 148 -164 197 148 -180 197 148 -197 197 148 -213 197 156 -230 197 156 -246 197 156 -255 205 172 -0 222 148 -16 222 148 -32 222 139 -65 213 148 -82 213 148 -98 213 148 -115 213 148 -139 213 148 -156 213 156 -172 213 156 -180 213 156 -197 213 156 -213 213 156 -230 213 156 -246 213 156 -255 222 172 -0 238 148 -16 238 139 -49 230 148 -65 230 148 -82 230 148 -98 230 148 -123 230 148 -139 230 148 -156 230 156 -172 230 156 -180 230 156 -197 230 156 -213 230 156 -230 230 156 -246 230 156 -255 230 172 -0 255 148 -32 246 148 -49 246 148 -65 246 148 -82 246 148 -106 246 148 -123 246 156 -139 246 156 -156 246 156 -172 246 156 -189 246 156 -197 246 156 -213 246 156 -230 246 156 -246 246 156 -255 246 172 -24 255 148 -41 255 148 -57 255 148 -74 255 148 -90 255 148 -106 255 148 -123 255 156 -139 255 156 -172 255 172 -180 255 172 -197 255 172 -205 255 172 -222 255 172 -230 255 172 -246 255 172 -255 255 172 diff --git a/graphics/misc/sunny_day/80.pal b/graphics/misc/sunny_day/80.pal deleted file mode 100644 index c5cbf6d01d..0000000000 --- a/graphics/misc/sunny_day/80.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 8 -24 8 8 -41 8 8 -57 8 8 -74 8 8 -90 8 8 -106 8 8 -197 0 0 -213 0 0 -230 0 0 -246 0 0 -255 0 0 -255 16 16 -255 32 32 -255 49 49 -255 74 74 -8 24 8 -24 24 8 -41 24 8 -57 24 8 -74 24 8 -90 24 8 -106 24 8 -197 24 0 -213 24 0 -230 16 0 -246 16 0 -255 16 0 -255 32 16 -255 49 32 -255 65 49 -255 82 74 -8 41 8 -24 41 8 -41 41 8 -57 41 8 -74 41 8 -90 41 8 -106 41 8 -197 49 0 -213 49 0 -230 49 0 -246 41 0 -255 41 0 -255 49 16 -255 65 32 -255 74 49 -255 98 74 -8 57 8 -24 57 8 -41 57 8 -57 57 8 -74 57 8 -90 57 8 -106 57 8 -197 82 0 -213 74 0 -230 65 0 -246 65 0 -255 65 0 -255 74 16 -255 82 32 -255 90 49 -255 106 74 -8 74 8 -24 74 8 -41 74 8 -57 74 8 -74 74 8 -90 74 8 -106 74 8 -197 106 0 -213 106 0 -230 98 0 -246 90 0 -255 90 0 -255 90 16 -255 98 32 -255 106 49 -255 123 74 -8 90 8 -24 90 8 -41 90 8 -57 90 8 -74 90 8 -90 90 8 -106 90 8 -197 131 0 -213 131 0 -230 123 0 -246 123 0 -255 115 0 -255 115 16 -255 115 32 -255 123 49 -255 131 74 -8 106 8 -24 106 8 -41 106 8 -57 106 8 -74 106 8 -90 106 8 -106 106 8 -197 164 0 -213 156 0 -230 148 0 -246 139 0 -255 139 0 -255 139 16 -255 131 32 -255 139 49 -255 148 74 -0 197 0 -24 197 0 -57 197 0 -82 197 0 -115 197 0 -139 197 0 -164 197 0 -197 197 0 -213 180 0 -230 172 0 -246 164 0 -255 156 0 -255 156 16 -255 156 32 -255 156 49 -255 156 74 -0 213 0 -24 213 0 -49 213 0 -74 213 0 -106 213 0 -131 213 0 -156 213 0 -189 213 0 -213 213 0 -230 197 0 -246 189 0 -255 189 0 -255 172 16 -255 164 32 -255 164 49 -255 172 74 -0 230 0 -24 230 0 -49 230 0 -74 230 0 -98 230 0 -123 230 0 -148 230 0 -180 230 0 -205 230 0 -230 230 0 -246 213 0 -255 205 0 -255 197 16 -255 189 32 -255 180 49 -255 180 74 -0 246 0 -24 246 0 -49 246 0 -74 246 0 -98 246 0 -123 246 0 -148 246 0 -172 246 0 -197 246 0 -222 246 0 -246 246 0 -255 230 0 -255 213 16 -255 205 32 -255 197 49 -255 197 74 -0 255 0 -24 255 0 -49 255 0 -74 255 0 -90 255 0 -123 255 0 -139 255 0 -164 255 0 -189 255 0 -213 255 0 -238 255 0 -255 255 0 -255 238 16 -255 222 32 -255 213 49 -255 205 74 -16 255 16 -32 255 16 -57 255 16 -74 255 16 -98 255 16 -115 255 16 -139 255 16 -156 255 16 -180 255 16 -197 255 16 -222 255 16 -238 255 16 -255 255 16 -255 238 32 -255 230 49 -255 222 74 -32 255 32 -49 255 32 -65 255 32 -82 255 32 -106 255 32 -115 255 32 -139 255 32 -156 255 32 -172 255 32 -189 255 32 -205 255 32 -222 255 32 -246 255 32 -255 255 32 -255 238 49 -255 230 74 -49 255 49 -65 255 49 -82 255 49 -90 255 49 -115 255 49 -123 255 49 -139 255 49 -156 255 49 -172 255 49 -189 255 49 -197 255 49 -213 255 49 -230 255 49 -246 255 49 -255 255 49 -255 246 74 -74 255 74 -90 255 74 -98 255 74 -115 255 74 -123 255 74 -139 255 74 -148 255 74 -164 255 74 -172 255 74 -189 255 74 -197 255 74 -213 255 74 -222 255 74 -238 255 74 -246 255 74 -255 255 74 diff --git a/graphics/misc/sunny_day/81.pal b/graphics/misc/sunny_day/81.pal deleted file mode 100644 index e0f8b86365..0000000000 --- a/graphics/misc/sunny_day/81.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 24 -24 8 24 -41 8 24 -57 8 24 -74 8 24 -90 8 24 -106 8 24 -197 0 24 -213 0 24 -230 0 24 -246 0 24 -255 0 24 -255 16 32 -255 32 49 -255 49 65 -255 74 90 -8 24 24 -24 24 24 -41 24 24 -57 24 24 -74 24 24 -90 24 24 -172 16 16 -189 16 16 -205 16 16 -230 16 16 -246 8 8 -246 24 24 -255 41 41 -255 57 57 -255 74 74 -255 90 90 -8 41 24 -24 41 24 -41 41 24 -57 41 24 -74 41 24 -90 41 24 -172 49 16 -189 41 16 -205 41 16 -230 41 16 -246 32 8 -246 41 24 -255 57 41 -255 65 57 -255 90 74 -255 106 90 -8 57 24 -24 57 24 -41 57 24 -57 57 24 -74 57 24 -90 57 24 -172 74 16 -189 74 16 -205 65 16 -230 65 16 -246 57 8 -246 65 24 -255 74 41 -255 82 57 -255 106 74 -255 115 90 -8 74 24 -24 74 24 -41 74 24 -57 74 24 -74 74 24 -90 74 24 -172 106 16 -189 106 16 -205 98 16 -230 90 16 -246 82 8 -246 90 24 -255 98 41 -255 106 57 -255 115 74 -255 123 90 -8 90 24 -24 90 24 -41 90 24 -57 90 24 -74 90 24 -90 90 24 -172 139 16 -189 131 16 -205 123 16 -230 123 16 -246 115 8 -246 106 24 -255 115 41 -255 115 57 -255 131 74 -255 139 90 -8 106 24 -16 172 16 -49 172 16 -82 172 16 -106 172 16 -139 172 16 -172 172 16 -189 156 16 -205 148 16 -230 148 16 -246 139 8 -246 139 24 -255 131 41 -255 131 57 -255 139 74 -255 148 90 -0 197 24 -16 189 16 -49 189 16 -74 189 16 -106 189 16 -131 189 16 -164 189 16 -189 189 16 -205 180 16 -230 172 16 -246 164 8 -246 156 24 -255 156 41 -255 156 57 -255 156 74 -255 164 90 -0 213 24 -16 205 16 -41 205 16 -74 205 16 -98 205 16 -131 205 16 -156 205 16 -180 205 16 -205 205 16 -230 197 16 -246 189 8 -246 180 24 -255 172 41 -255 164 57 -255 172 74 -255 172 90 -0 230 16 -16 230 16 -41 230 16 -65 230 16 -98 230 16 -123 230 16 -148 230 16 -172 230 16 -205 230 16 -230 230 16 -246 222 8 -246 197 24 -255 189 41 -255 180 57 -255 189 74 -255 189 90 -0 246 16 -8 246 8 -41 246 8 -65 246 8 -90 246 8 -115 246 8 -148 246 8 -164 246 8 -197 246 8 -222 246 8 -246 246 8 -246 222 24 -255 205 41 -255 205 57 -255 197 74 -255 197 90 -0 255 16 -24 246 24 -49 246 24 -65 246 24 -90 246 24 -115 246 24 -139 246 24 -156 246 24 -180 246 24 -205 246 24 -230 246 24 -246 246 24 -255 230 41 -255 213 57 -255 213 74 -255 205 90 -16 255 32 -41 255 41 -57 255 41 -74 255 41 -98 255 41 -115 255 41 -139 255 41 -156 255 41 -172 255 41 -197 255 41 -213 255 41 -238 255 41 -255 255 41 -255 230 57 -255 230 74 -255 222 90 -32 255 49 -57 255 57 -74 255 57 -90 255 57 -106 255 57 -123 255 57 -139 255 57 -156 255 57 -172 255 57 -189 255 57 -205 255 57 -222 255 57 -238 255 57 -255 255 57 -255 246 74 -255 230 90 -49 255 65 -74 255 74 -90 255 74 -106 255 74 -115 255 74 -131 255 74 -148 255 74 -164 255 74 -180 255 74 -189 255 74 -205 255 74 -213 255 74 -230 255 74 -246 255 74 -255 255 74 -255 246 90 -74 255 82 -90 255 90 -106 255 90 -115 255 90 -131 255 90 -139 255 90 -156 255 90 -164 255 90 -172 255 90 -189 255 90 -197 255 90 -213 255 90 -222 255 90 -238 255 90 -246 255 90 -255 255 90 diff --git a/graphics/misc/sunny_day/82.pal b/graphics/misc/sunny_day/82.pal deleted file mode 100644 index 289f94a69a..0000000000 --- a/graphics/misc/sunny_day/82.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 41 -24 8 41 -41 8 41 -57 8 41 -74 8 41 -90 8 41 -106 8 41 -197 0 57 -213 0 49 -230 0 49 -246 0 49 -255 0 49 -255 16 57 -255 32 65 -255 49 82 -255 74 98 -8 24 41 -24 24 41 -41 24 41 -57 24 41 -74 24 41 -90 24 41 -172 16 49 -189 16 49 -205 16 41 -230 16 41 -246 8 41 -246 24 49 -255 41 57 -255 57 74 -255 74 90 -255 90 106 -8 41 41 -24 41 41 -41 41 41 -57 41 41 -74 41 41 -139 49 49 -164 41 41 -189 41 41 -205 32 32 -222 32 32 -230 49 49 -230 57 57 -238 65 65 -246 90 90 -255 90 90 -255 106 106 -8 57 41 -24 57 41 -41 57 41 -57 57 41 -74 57 41 -139 74 49 -164 74 41 -189 65 41 -205 57 32 -222 57 32 -230 65 49 -230 74 57 -238 82 65 -246 98 90 -255 106 90 -255 123 106 -8 74 41 -24 74 41 -41 74 41 -57 74 41 -74 74 41 -139 106 49 -164 106 41 -189 90 41 -205 90 32 -222 90 32 -230 90 49 -230 98 57 -238 98 65 -246 115 90 -255 115 90 -255 131 106 -8 90 41 -24 90 41 -49 139 49 -82 139 49 -106 139 49 -139 139 49 -164 131 41 -189 123 41 -205 123 32 -222 115 32 -230 115 49 -230 115 57 -238 115 65 -246 131 90 -255 131 90 -255 139 106 -8 106 41 -16 172 49 -41 164 41 -74 164 41 -106 164 41 -131 164 41 -164 164 41 -189 156 41 -205 148 32 -222 139 32 -230 139 49 -230 131 57 -238 131 65 -246 139 90 -255 148 90 -255 156 106 -0 197 49 -16 189 41 -41 189 41 -65 189 41 -98 189 41 -123 189 41 -156 189 41 -189 189 41 -205 172 32 -222 164 32 -230 156 49 -230 156 57 -238 156 65 -246 156 90 -255 156 90 -255 164 106 -0 213 49 -16 205 41 -32 205 32 -65 205 32 -90 205 32 -123 205 32 -148 205 32 -172 205 32 -205 205 32 -222 197 32 -230 180 49 -230 172 57 -238 164 65 -246 172 90 -255 172 90 -255 180 106 -0 230 49 -16 230 41 -32 222 32 -65 222 32 -90 222 32 -115 222 32 -148 222 32 -172 222 32 -197 222 32 -222 222 32 -230 205 49 -230 189 57 -238 180 65 -246 189 90 -255 189 90 -255 189 106 -0 246 41 -8 246 32 -49 230 49 -65 230 49 -90 230 49 -115 230 49 -139 230 49 -164 230 49 -180 230 49 -205 230 49 -230 230 49 -230 213 57 -238 205 65 -246 205 90 -255 197 90 -255 197 106 -0 255 41 -24 246 41 -57 230 57 -74 230 57 -98 230 57 -115 230 57 -139 230 57 -156 230 57 -172 230 57 -197 230 57 -213 230 57 -230 230 57 -238 222 65 -246 213 90 -255 213 90 -255 213 106 -16 255 49 -41 255 57 -65 238 65 -90 238 65 -106 238 65 -123 238 65 -139 238 65 -156 238 65 -172 238 65 -189 238 65 -205 238 65 -222 238 65 -238 238 65 -246 230 90 -255 230 90 -255 222 106 -32 255 65 -57 255 65 -90 246 90 -106 246 90 -115 246 90 -131 246 90 -148 246 90 -164 246 90 -172 246 90 -189 246 90 -205 246 90 -222 246 90 -230 246 90 -246 246 90 -255 238 90 -255 230 106 -49 255 74 -74 255 90 -90 255 90 -106 255 90 -123 255 90 -131 255 90 -148 255 90 -164 255 90 -172 255 90 -189 255 90 -205 255 90 -213 255 90 -230 255 90 -246 255 90 -255 255 90 -255 246 106 -74 255 98 -90 255 106 -106 255 106 -123 255 106 -131 255 106 -148 255 106 -156 255 106 -164 255 106 -180 255 106 -189 255 106 -205 255 106 -213 255 106 -222 255 106 -238 255 106 -246 255 106 -255 255 106 diff --git a/graphics/misc/sunny_day/83.pal b/graphics/misc/sunny_day/83.pal deleted file mode 100644 index f68c13c656..0000000000 --- a/graphics/misc/sunny_day/83.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 57 -24 8 57 -41 8 57 -57 8 57 -74 8 57 -90 8 57 -106 8 57 -197 0 82 -213 0 74 -230 0 74 -246 0 74 -255 0 74 -255 16 74 -255 32 82 -255 49 90 -255 74 115 -8 24 57 -24 24 57 -41 24 57 -57 24 57 -74 24 57 -90 24 57 -172 16 82 -189 16 74 -205 16 74 -230 16 65 -246 8 65 -246 24 65 -255 41 74 -255 57 90 -255 74 106 -255 90 115 -8 41 57 -24 41 57 -41 41 57 -57 41 57 -74 41 57 -139 49 82 -164 41 74 -189 41 65 -205 32 65 -222 32 65 -230 49 65 -230 57 74 -238 65 90 -246 90 106 -255 90 106 -255 106 123 -8 57 57 -24 57 57 -41 57 57 -57 57 57 -115 74 74 -139 65 65 -156 65 65 -180 57 57 -197 57 57 -205 65 65 -213 74 74 -222 82 82 -238 98 98 -246 106 106 -255 106 106 -255 123 123 -8 74 57 -24 74 57 -41 74 57 -74 115 74 -115 115 74 -139 106 65 -156 90 65 -180 90 57 -197 82 57 -205 90 65 -213 90 74 -222 98 82 -238 115 98 -246 115 106 -255 123 106 -255 139 123 -8 90 57 -24 90 57 -49 139 74 -65 139 65 -106 139 65 -139 139 65 -156 123 65 -180 123 57 -197 115 57 -205 115 65 -213 115 74 -222 115 82 -238 131 98 -246 131 106 -255 131 106 -255 148 123 -8 106 57 -16 172 74 -41 164 74 -65 156 65 -98 156 65 -131 156 65 -156 156 65 -180 148 57 -197 139 57 -205 139 65 -213 131 74 -222 131 82 -238 139 98 -246 148 106 -255 148 106 -255 156 123 -0 197 82 -16 189 74 -41 189 65 -57 180 57 -90 180 57 -123 180 57 -148 180 57 -180 180 57 -197 164 57 -205 156 65 -213 156 74 -222 156 82 -238 156 98 -246 156 106 -255 164 106 -255 172 123 -0 213 74 -16 205 65 -32 205 57 -57 197 57 -90 197 57 -115 197 57 -139 197 57 -172 197 57 -197 197 57 -205 180 65 -213 172 74 -222 172 82 -238 172 98 -246 172 106 -255 180 106 -255 180 123 -0 230 65 -16 230 65 -32 222 57 -65 205 65 -90 205 65 -115 205 65 -139 205 65 -164 205 65 -180 205 65 -205 205 65 -213 197 74 -222 189 82 -238 189 98 -246 189 106 -255 189 106 -255 189 123 -0 246 65 -8 246 57 -49 230 65 -74 213 74 -98 213 74 -115 213 74 -139 213 74 -156 213 74 -180 213 74 -197 213 74 -213 213 74 -222 205 82 -238 205 98 -246 205 106 -255 205 106 -255 205 123 -0 255 65 -24 246 65 -57 230 74 -82 222 82 -98 222 82 -115 222 82 -139 222 82 -156 222 82 -172 222 82 -189 222 82 -205 222 82 -222 222 82 -238 222 98 -246 213 106 -255 213 106 -255 213 123 -16 255 74 -41 255 74 -65 238 82 -98 238 98 -115 238 98 -131 238 98 -148 238 98 -164 238 98 -172 238 98 -189 238 98 -205 238 98 -222 238 98 -238 238 98 -246 230 106 -255 230 106 -255 222 123 -32 255 82 -57 255 82 -90 246 98 -106 246 106 -123 246 106 -131 246 106 -148 246 106 -164 246 106 -172 246 106 -189 246 106 -205 246 106 -222 246 106 -230 246 106 -246 246 106 -255 246 106 -255 238 123 -49 255 90 -74 255 106 -90 255 106 -106 255 106 -123 255 106 -139 255 106 -156 255 106 -164 255 106 -180 255 106 -189 255 106 -205 255 106 -222 255 106 -230 255 106 -246 255 106 -255 255 106 -255 246 123 -74 255 106 -90 255 115 -106 255 123 -123 255 123 -139 255 123 -148 255 123 -156 255 123 -172 255 123 -180 255 123 -189 255 123 -205 255 123 -213 255 123 -222 255 123 -238 255 123 -246 255 123 -255 255 123 diff --git a/graphics/misc/sunny_day/84.pal b/graphics/misc/sunny_day/84.pal deleted file mode 100644 index 635c5f0491..0000000000 --- a/graphics/misc/sunny_day/84.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 74 -24 8 74 -41 8 74 -57 8 74 -74 8 74 -90 8 74 -106 8 74 -197 0 115 -213 0 106 -230 0 98 -246 0 98 -255 0 90 -255 16 98 -255 32 106 -255 49 115 -255 74 123 -8 24 74 -24 24 74 -41 24 74 -57 24 74 -74 24 74 -90 24 74 -172 16 106 -189 16 106 -205 16 98 -230 16 98 -246 8 90 -246 24 90 -255 41 98 -255 57 106 -255 74 115 -255 90 131 -8 41 74 -24 41 74 -41 41 74 -57 41 74 -74 41 74 -139 49 106 -164 41 106 -189 41 98 -205 32 90 -222 32 90 -230 49 90 -230 57 98 -238 65 106 -246 90 115 -255 90 123 -255 106 131 -8 57 74 -24 57 74 -41 57 74 -74 74 115 -115 74 115 -139 65 106 -156 65 98 -180 57 90 -197 57 90 -205 65 90 -213 74 98 -222 82 98 -238 98 115 -246 106 123 -255 106 123 -255 123 139 -8 74 74 -24 74 74 -41 74 74 -74 115 115 -115 90 90 -131 90 90 -156 82 82 -172 82 82 -189 82 82 -197 90 90 -205 98 98 -222 115 115 -238 115 115 -246 123 123 -255 131 131 -255 148 148 -8 90 74 -24 90 74 -49 139 106 -65 139 106 -90 131 90 -131 131 90 -156 123 82 -172 106 82 -189 115 82 -197 115 90 -205 115 98 -222 131 115 -238 131 115 -246 131 123 -255 139 131 -255 156 148 -8 106 74 -16 172 106 -41 164 106 -65 156 90 -82 156 82 -123 156 82 -156 156 82 -172 139 82 -189 139 82 -197 131 90 -205 131 98 -222 148 115 -238 148 115 -246 148 123 -255 148 131 -255 164 148 -0 197 106 -16 189 106 -41 189 90 -57 180 90 -82 172 82 -115 172 82 -148 172 82 -172 172 82 -189 164 82 -197 156 90 -205 156 98 -222 156 115 -238 164 115 -246 164 123 -255 164 131 -255 172 148 -0 213 106 -16 205 98 -32 205 90 -57 197 82 -82 189 82 -115 189 82 -139 189 82 -164 189 82 -189 189 82 -197 172 90 -205 172 98 -222 172 115 -238 172 115 -246 172 123 -255 180 131 -255 180 148 -0 230 98 -16 230 90 -32 222 90 -65 205 90 -90 197 90 -115 197 90 -131 197 90 -156 197 90 -180 197 90 -197 197 90 -205 189 98 -222 189 115 -238 189 115 -246 189 123 -255 189 131 -255 197 148 -0 246 90 -8 246 82 -49 230 90 -74 213 90 -98 205 98 -115 205 98 -139 205 98 -156 205 98 -172 205 98 -189 205 98 -205 205 98 -222 205 115 -238 205 115 -246 205 123 -255 205 131 -255 205 148 -0 255 90 -24 246 90 -57 230 98 -82 222 98 -115 222 115 -131 222 115 -148 222 115 -164 222 115 -172 222 115 -189 222 115 -205 222 115 -222 222 115 -238 222 115 -246 213 123 -255 213 131 -255 213 148 -16 255 90 -41 255 98 -65 238 98 -98 238 115 -115 238 115 -131 238 115 -148 238 115 -164 238 115 -172 238 115 -189 238 115 -205 238 115 -222 238 115 -238 238 115 -246 230 123 -255 230 131 -255 230 148 -32 255 98 -57 255 106 -90 246 115 -106 246 115 -123 246 123 -139 246 123 -148 246 123 -164 246 123 -180 246 123 -189 246 123 -205 246 123 -222 246 123 -230 246 123 -246 246 123 -255 246 131 -255 238 148 -49 255 106 -74 255 115 -90 255 115 -106 255 123 -131 255 131 -139 255 131 -156 255 131 -164 255 131 -180 255 131 -189 255 131 -205 255 131 -222 255 131 -230 255 131 -246 255 131 -255 255 131 -255 246 148 -74 255 123 -90 255 123 -106 255 131 -123 255 139 -148 255 148 -156 255 148 -164 255 148 -172 255 148 -189 255 148 -197 255 148 -205 255 148 -213 255 148 -230 255 148 -238 255 148 -246 255 148 -255 255 148 diff --git a/graphics/misc/sunny_day/85.pal b/graphics/misc/sunny_day/85.pal deleted file mode 100644 index 8cdcbdaf8b..0000000000 --- a/graphics/misc/sunny_day/85.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 90 -24 8 90 -41 8 90 -57 8 90 -74 8 90 -90 8 90 -106 8 90 -197 0 139 -213 0 131 -230 0 123 -246 0 123 -255 0 123 -255 16 115 -255 32 115 -255 49 123 -255 74 139 -8 24 90 -24 24 90 -41 24 90 -57 24 90 -74 24 90 -90 24 90 -172 16 139 -189 16 131 -205 16 131 -230 16 123 -246 8 115 -246 24 115 -255 41 115 -255 57 123 -255 74 131 -255 90 139 -8 41 90 -24 41 90 -49 49 139 -74 49 139 -106 49 139 -139 49 139 -164 41 131 -189 41 123 -205 32 123 -222 32 115 -230 49 115 -230 57 115 -238 65 123 -246 90 131 -255 90 131 -255 106 148 -8 57 90 -24 57 90 -49 82 139 -65 65 139 -106 65 139 -139 65 139 -156 65 131 -180 57 123 -197 57 115 -205 65 115 -213 74 115 -222 82 115 -238 98 131 -246 106 131 -255 106 139 -255 123 148 -8 74 90 -24 74 90 -49 106 139 -65 106 139 -90 90 131 -131 90 131 -156 82 123 -172 82 115 -189 82 115 -197 90 115 -205 98 115 -222 115 131 -238 115 131 -246 123 139 -255 131 139 -255 148 156 -8 90 90 -24 90 90 -49 139 139 -65 139 139 -90 131 131 -131 106 106 -156 106 106 -164 106 106 -180 106 106 -197 115 115 -205 123 123 -222 131 131 -238 131 131 -246 139 139 -255 148 148 -255 164 164 -8 106 90 -16 172 139 -41 164 131 -65 156 123 -82 156 123 -106 156 106 -156 156 106 -164 139 106 -180 131 106 -197 131 115 -205 139 123 -222 148 131 -238 148 131 -246 156 139 -255 156 148 -255 172 164 -0 197 131 -16 189 131 -41 189 123 -57 180 123 -82 172 106 -106 164 106 -139 164 106 -164 164 106 -180 156 106 -197 156 115 -205 156 123 -222 156 131 -238 164 131 -246 164 139 -255 172 148 -255 180 164 -0 213 131 -16 205 123 -32 205 123 -57 197 115 -82 189 115 -106 180 106 -131 180 106 -156 180 106 -180 180 106 -197 172 115 -205 172 123 -222 172 131 -238 172 131 -246 180 139 -255 180 148 -255 189 164 -0 230 123 -16 230 123 -32 222 115 -65 205 115 -90 197 115 -115 197 115 -131 197 115 -156 197 115 -172 197 115 -197 197 115 -205 189 123 -222 189 131 -238 189 131 -246 189 139 -255 197 148 -255 197 164 -0 246 123 -8 246 115 -49 230 115 -74 213 115 -98 205 115 -123 205 123 -139 205 123 -156 205 123 -172 205 123 -189 205 123 -205 205 123 -222 205 131 -238 205 131 -246 205 139 -255 205 148 -255 213 164 -0 255 115 -24 246 106 -57 230 115 -82 222 115 -115 222 131 -131 222 131 -148 222 131 -164 222 131 -172 222 131 -189 222 131 -205 222 131 -222 222 131 -238 222 131 -246 222 139 -255 222 148 -255 222 164 -16 255 115 -41 255 115 -65 238 115 -98 238 131 -115 238 131 -131 238 131 -148 238 131 -164 238 131 -180 238 131 -189 238 131 -205 238 131 -222 238 131 -238 238 131 -246 230 139 -255 230 148 -255 230 164 -32 255 115 -57 255 115 -90 246 131 -106 246 131 -123 246 131 -139 246 139 -156 246 139 -164 246 139 -180 246 139 -189 246 139 -205 246 139 -222 246 139 -230 246 139 -246 246 139 -255 246 148 -255 238 164 -49 255 123 -74 255 131 -90 255 131 -106 255 131 -131 255 139 -148 255 148 -156 255 148 -172 255 148 -180 255 148 -197 255 148 -205 255 148 -222 255 148 -230 255 148 -246 255 148 -255 255 148 -255 246 164 -74 255 131 -90 255 139 -106 255 139 -123 255 148 -148 255 156 -164 255 164 -172 255 164 -180 255 164 -189 255 164 -197 255 164 -213 255 164 -222 255 164 -230 255 164 -238 255 164 -246 255 164 -255 255 164 diff --git a/graphics/misc/sunny_day/86.pal b/graphics/misc/sunny_day/86.pal deleted file mode 100644 index 33157fd950..0000000000 --- a/graphics/misc/sunny_day/86.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -8 8 106 -24 8 106 -41 8 106 -57 8 106 -74 8 106 -90 8 106 -106 8 106 -197 0 164 -213 0 156 -230 0 148 -246 0 148 -255 0 139 -255 16 139 -255 32 139 -255 49 139 -255 74 148 -8 24 106 -16 16 172 -49 16 172 -74 16 172 -106 16 172 -139 16 172 -172 16 172 -189 16 164 -205 16 156 -230 16 148 -246 8 148 -246 24 139 -255 41 139 -255 57 139 -255 74 148 -255 90 156 -8 41 106 -16 49 172 -41 41 164 -74 41 164 -106 41 164 -131 41 164 -164 41 164 -189 41 156 -205 32 148 -222 32 148 -230 49 139 -230 57 139 -238 65 139 -246 90 148 -255 90 148 -255 106 156 -8 57 106 -16 82 172 -41 74 164 -65 65 156 -90 65 156 -123 65 156 -156 65 156 -180 57 148 -197 57 139 -205 65 139 -213 74 139 -222 82 139 -238 98 148 -246 106 148 -255 106 156 -255 123 156 -8 74 106 -16 106 172 -41 106 164 -65 98 156 -82 82 156 -123 82 156 -156 82 156 -172 82 148 -189 82 139 -197 90 131 -205 98 139 -222 115 148 -238 115 148 -246 123 148 -255 131 156 -255 148 164 -8 90 106 -16 139 172 -41 131 164 -65 131 156 -82 123 156 -106 106 156 -156 106 156 -164 106 139 -180 106 131 -197 115 131 -205 123 139 -222 131 148 -238 131 148 -246 139 156 -255 148 156 -255 164 172 -8 106 106 -16 172 172 -41 164 164 -65 156 156 -82 156 156 -106 156 156 -148 123 123 -164 123 123 -180 131 131 -197 139 139 -205 139 139 -222 148 148 -238 148 148 -246 156 156 -255 164 164 -255 180 180 -0 197 164 -16 189 156 -41 189 156 -57 180 148 -82 172 139 -106 164 139 -123 164 123 -164 164 123 -180 156 131 -197 156 139 -205 156 139 -222 164 148 -238 164 148 -246 172 156 -255 172 164 -255 189 180 -0 213 156 -16 205 148 -32 205 148 -57 197 139 -82 189 139 -106 180 131 -131 180 131 -156 180 131 -180 180 131 -197 172 139 -205 172 139 -222 172 148 -238 180 148 -246 180 156 -255 189 164 -255 197 180 -0 230 148 -16 230 148 -32 222 139 -65 205 139 -90 197 131 -115 197 131 -139 197 139 -156 197 139 -172 197 139 -197 197 139 -205 189 139 -222 189 148 -238 189 148 -246 197 156 -255 197 164 -255 205 180 -0 246 139 -8 246 139 -49 230 139 -74 213 131 -98 205 131 -123 205 139 -139 205 139 -156 205 139 -172 205 139 -189 205 139 -205 205 139 -222 205 148 -238 205 148 -246 205 156 -255 213 164 -255 213 180 -0 255 139 -24 246 139 -57 230 131 -82 222 131 -115 222 148 -131 222 148 -148 222 148 -164 222 148 -180 222 148 -189 222 148 -205 222 148 -222 222 148 -238 222 148 -246 222 156 -255 222 164 -255 222 180 -16 255 139 -41 255 131 -65 238 131 -98 238 139 -115 238 148 -131 238 148 -148 238 148 -164 238 148 -180 238 148 -189 238 148 -205 238 148 -222 238 148 -238 238 148 -246 230 156 -255 230 164 -255 230 180 -32 255 131 -57 255 131 -90 246 139 -106 246 148 -123 246 148 -139 246 156 -156 246 156 -172 246 156 -180 246 156 -197 246 156 -205 246 156 -222 246 156 -230 246 156 -246 246 156 -255 246 164 -255 238 180 -49 255 139 -74 255 139 -90 255 148 -106 255 148 -131 255 148 -148 255 156 -164 255 164 -172 255 164 -189 255 164 -197 255 164 -213 255 164 -222 255 164 -230 255 164 -246 255 164 -255 255 164 -255 246 180 -74 255 148 -90 255 148 -106 255 156 -123 255 156 -148 255 164 -164 255 172 -180 255 180 -189 255 180 -197 255 180 -205 255 180 -213 255 180 -222 255 180 -230 255 180 -238 255 180 -255 255 180 -255 255 180 diff --git a/graphics/misc/sunny_day/87.pal b/graphics/misc/sunny_day/87.pal deleted file mode 100644 index ed7a74501c..0000000000 --- a/graphics/misc/sunny_day/87.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 197 -24 0 197 -49 0 197 -82 0 197 -106 0 197 -131 0 197 -164 0 197 -197 0 197 -213 0 189 -230 0 180 -246 0 172 -255 0 164 -255 16 156 -255 32 156 -255 49 156 -255 74 164 -0 24 197 -16 16 189 -41 16 189 -74 16 189 -106 16 189 -131 16 189 -156 16 189 -189 16 189 -205 16 180 -230 16 172 -246 8 164 -246 24 156 -255 41 156 -255 57 156 -255 74 164 -255 90 164 -0 57 197 -16 49 189 -41 41 189 -65 41 189 -90 41 189 -123 41 189 -156 41 189 -189 41 189 -205 32 172 -222 32 172 -230 49 164 -230 57 156 -238 65 156 -246 90 164 -255 90 164 -255 106 164 -0 82 197 -16 74 189 -41 65 189 -57 57 180 -90 57 180 -123 57 180 -148 57 180 -180 57 180 -197 57 172 -205 65 164 -213 74 156 -222 82 156 -238 98 164 -246 106 164 -255 106 164 -255 123 172 -0 115 197 -16 106 189 -41 98 189 -57 90 180 -82 82 172 -106 82 172 -139 82 172 -172 82 172 -189 82 164 -197 90 156 -205 98 156 -222 115 164 -238 115 164 -246 123 164 -255 131 164 -255 148 172 -0 139 197 -16 131 189 -41 123 189 -57 123 180 -82 115 172 -106 106 164 -139 106 164 -164 106 164 -180 106 156 -197 115 156 -205 123 156 -222 131 164 -238 131 164 -246 139 164 -255 148 172 -255 164 180 -0 164 197 -16 164 189 -41 156 189 -57 148 180 -82 148 172 -106 139 164 -123 123 164 -164 123 164 -180 131 156 -197 139 156 -205 139 156 -222 148 164 -238 148 164 -246 156 172 -255 164 172 -255 180 189 -0 197 197 -16 189 189 -41 189 189 -57 180 180 -82 172 172 -106 164 164 -123 164 164 -164 139 139 -180 156 156 -197 156 156 -205 156 156 -222 164 164 -238 172 172 -246 172 172 -255 180 180 -255 197 197 -0 213 180 -16 205 180 -32 205 172 -57 197 164 -82 189 164 -106 180 156 -131 180 156 -156 180 156 -180 180 156 -197 172 156 -205 172 156 -222 180 164 -238 180 172 -246 180 172 -255 189 180 -255 205 197 -0 230 172 -16 230 172 -32 222 164 -65 205 156 -90 197 156 -115 197 156 -139 197 156 -156 197 156 -172 197 156 -197 197 156 -205 189 156 -222 189 164 -238 197 172 -246 197 172 -255 205 180 -255 213 197 -0 246 164 -8 246 164 -49 230 156 -74 213 156 -98 205 156 -123 205 156 -139 205 156 -156 205 156 -172 205 156 -189 205 156 -205 205 156 -222 205 164 -238 205 172 -246 213 172 -255 213 180 -255 222 197 -0 255 156 -24 246 156 -57 230 156 -82 222 156 -115 222 156 -131 222 156 -148 222 164 -164 222 164 -180 222 164 -189 222 164 -205 222 164 -222 222 164 -238 222 172 -246 222 172 -255 222 180 -255 230 197 -16 255 156 -41 255 156 -65 238 156 -98 238 156 -115 238 164 -131 238 164 -148 238 164 -172 238 172 -180 238 172 -197 238 172 -205 238 172 -222 238 172 -238 238 172 -246 230 172 -255 230 180 -255 238 197 -32 255 156 -57 255 156 -90 246 156 -106 246 156 -123 246 164 -139 246 164 -156 246 172 -172 246 172 -189 246 172 -197 246 172 -213 246 172 -222 246 172 -230 246 172 -246 246 172 -255 246 180 -255 246 197 -49 255 156 -74 255 156 -90 255 156 -106 255 164 -131 255 164 -148 255 172 -164 255 172 -180 255 180 -189 255 180 -205 255 180 -213 255 180 -222 255 180 -238 255 180 -246 255 180 -255 255 180 -255 246 197 -74 255 156 -90 255 164 -106 255 164 -123 255 172 -148 255 172 -164 255 180 -180 255 189 -197 255 197 -205 255 197 -213 255 197 -222 255 197 -230 255 197 -238 255 197 -246 255 197 -255 255 197 -255 255 197 diff --git a/graphics/misc/sunny_day/88.pal b/graphics/misc/sunny_day/88.pal deleted file mode 100644 index c01a4c5756..0000000000 --- a/graphics/misc/sunny_day/88.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 213 -24 0 213 -49 0 213 -74 0 213 -106 0 213 -131 0 213 -156 0 213 -180 0 213 -213 0 213 -230 0 205 -246 0 197 -255 0 189 -255 16 180 -255 32 172 -255 49 172 -255 74 172 -0 24 213 -16 16 205 -41 16 205 -65 16 205 -98 16 205 -123 16 205 -148 16 205 -180 16 205 -205 16 205 -230 16 205 -246 8 197 -246 24 180 -255 41 172 -255 57 172 -255 74 180 -255 90 172 -0 49 213 -16 41 205 -32 32 205 -57 32 205 -90 32 205 -123 32 205 -148 32 205 -172 32 205 -205 32 205 -222 32 197 -230 49 180 -230 57 172 -238 65 172 -246 90 172 -255 90 172 -255 106 180 -0 74 213 -16 74 205 -32 65 205 -57 57 197 -82 57 197 -115 57 197 -139 57 197 -164 57 197 -197 57 197 -205 65 180 -213 74 180 -222 82 172 -238 98 172 -246 106 172 -255 106 180 -255 123 180 -0 106 213 -16 98 205 -32 90 205 -57 90 197 -82 82 189 -115 82 189 -139 82 189 -164 82 189 -189 82 189 -197 90 180 -205 98 172 -222 115 172 -238 115 172 -246 123 180 -255 131 180 -255 148 189 -0 131 213 -16 131 205 -32 123 205 -57 115 197 -82 115 189 -106 106 180 -131 106 180 -156 106 180 -180 106 180 -197 115 172 -205 123 172 -222 131 172 -238 131 180 -246 139 180 -255 148 180 -255 164 189 -0 156 213 -16 156 205 -32 148 205 -57 139 197 -82 139 189 -106 131 180 -131 131 180 -156 131 180 -180 131 180 -197 139 172 -205 139 172 -222 148 180 -238 148 180 -246 156 180 -255 164 189 -255 180 197 -0 189 213 -16 180 205 -32 172 205 -57 172 197 -82 164 189 -106 156 180 -131 156 180 -156 156 180 -180 156 180 -197 156 172 -205 156 172 -222 164 180 -238 172 180 -246 172 189 -255 180 189 -255 197 205 -0 213 213 -16 205 205 -32 205 205 -57 197 197 -82 189 189 -106 180 180 -131 180 180 -156 180 180 -180 164 164 -197 172 172 -213 172 172 -222 180 180 -238 180 180 -246 189 189 -255 197 197 -255 222 222 -0 230 197 -16 230 197 -32 222 197 -65 205 180 -90 197 172 -115 197 172 -139 197 172 -156 197 172 -172 197 172 -197 197 172 -213 189 172 -222 197 180 -238 197 180 -246 197 189 -255 205 197 -255 230 222 -0 246 189 -8 246 189 -49 230 180 -74 213 172 -98 205 172 -123 205 172 -139 205 172 -156 205 172 -172 213 172 -189 213 172 -213 213 172 -222 205 180 -238 213 180 -246 213 189 -255 213 197 -255 230 222 -0 255 189 -24 246 180 -57 230 172 -82 222 172 -115 222 172 -131 222 172 -148 222 172 -164 222 180 -180 222 180 -197 222 180 -205 222 180 -222 222 180 -238 222 180 -246 222 189 -255 230 197 -255 238 222 -16 255 172 -41 255 172 -65 238 164 -98 238 172 -115 238 172 -131 238 172 -148 238 180 -172 238 180 -180 238 180 -197 238 180 -213 238 180 -222 238 180 -238 238 180 -246 238 189 -255 238 197 -255 246 222 -32 255 164 -57 255 164 -90 246 172 -106 246 172 -123 246 172 -139 246 180 -156 246 180 -172 246 180 -189 246 189 -205 246 189 -213 246 189 -222 246 189 -238 246 189 -246 246 189 -255 246 197 -255 246 222 -49 255 164 -74 255 172 -90 255 172 -106 255 180 -131 255 180 -148 255 180 -164 255 189 -180 255 189 -197 255 197 -205 255 197 -213 255 197 -230 255 197 -238 255 197 -246 255 197 -255 255 197 -255 255 222 -74 255 172 -90 255 172 -106 255 180 -123 255 180 -148 255 180 -164 255 189 -180 255 197 -197 255 205 -222 255 222 -230 255 222 -230 255 222 -238 255 222 -246 255 222 -246 255 222 -255 255 222 -255 255 222 diff --git a/graphics/misc/sunny_day/89.pal b/graphics/misc/sunny_day/89.pal deleted file mode 100644 index 70083e6b32..0000000000 --- a/graphics/misc/sunny_day/89.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 230 -16 0 230 -49 0 230 -65 0 230 -98 0 230 -123 0 230 -148 0 230 -172 0 230 -197 0 230 -230 0 230 -246 0 222 -255 0 213 -255 16 197 -255 32 189 -255 49 189 -255 74 189 -0 24 230 -16 16 230 -41 16 230 -65 16 230 -90 16 230 -123 16 230 -148 16 230 -172 16 230 -197 16 230 -230 16 230 -246 8 222 -246 24 205 -255 41 197 -255 57 189 -255 74 189 -255 90 189 -0 49 230 -16 41 230 -32 32 222 -57 32 222 -90 32 222 -115 32 222 -139 32 222 -164 32 222 -197 32 222 -222 32 222 -230 49 205 -230 57 197 -238 65 189 -246 90 189 -255 90 189 -255 106 189 -0 74 230 -16 65 230 -32 65 222 -65 65 205 -90 65 205 -115 65 205 -139 65 205 -156 65 205 -180 65 205 -205 65 205 -213 74 197 -222 82 189 -238 98 189 -246 106 189 -255 106 189 -255 123 189 -0 98 230 -16 98 230 -32 90 222 -65 90 205 -90 90 197 -115 90 197 -131 90 197 -156 90 197 -172 90 197 -197 90 197 -205 98 189 -222 115 189 -238 115 189 -246 123 189 -255 131 189 -255 148 197 -0 123 230 -16 123 230 -32 115 222 -65 115 205 -90 115 197 -115 115 197 -131 115 197 -156 115 197 -172 115 197 -197 115 197 -205 123 189 -222 131 189 -238 131 189 -246 139 189 -255 148 197 -255 164 197 -0 148 230 -16 148 230 -32 148 222 -65 139 205 -90 131 197 -115 131 197 -139 139 197 -156 139 197 -172 139 197 -197 139 197 -205 139 189 -222 148 189 -238 148 189 -246 156 197 -255 164 197 -255 180 205 -0 180 230 -16 172 230 -32 172 222 -65 164 205 -90 156 197 -115 156 197 -139 156 197 -156 156 197 -172 156 197 -197 156 197 -205 156 189 -222 164 189 -238 172 197 -246 172 197 -255 180 205 -255 197 213 -0 205 230 -16 205 230 -32 197 222 -65 180 205 -90 180 197 -115 172 197 -139 172 197 -156 172 197 -172 172 197 -197 172 197 -213 172 189 -222 180 197 -238 180 197 -246 189 205 -255 197 205 -255 222 230 -0 230 230 -16 230 230 -32 222 222 -65 205 205 -90 197 197 -115 197 197 -139 197 197 -156 197 197 -172 197 197 -197 189 189 -213 189 189 -222 197 197 -238 197 197 -246 205 205 -255 222 222 -255 238 238 -0 246 213 -8 246 222 -49 230 205 -74 213 197 -98 205 189 -123 205 189 -139 205 189 -156 205 189 -172 213 189 -189 213 189 -213 213 189 -222 213 197 -238 213 197 -246 213 205 -255 230 222 -255 238 238 -0 255 205 -24 246 197 -57 230 189 -82 222 189 -115 222 189 -131 222 189 -148 222 189 -164 222 189 -180 222 197 -197 222 197 -213 222 197 -222 222 197 -238 222 197 -246 230 205 -255 238 222 -255 246 238 -16 255 197 -41 255 189 -65 238 180 -98 238 189 -115 238 189 -131 238 189 -148 238 189 -172 238 197 -180 238 197 -197 238 197 -213 238 197 -222 238 197 -238 238 197 -246 238 205 -255 246 222 -255 246 238 -32 255 189 -57 255 180 -90 246 189 -106 246 189 -123 246 189 -139 246 189 -156 246 197 -172 246 197 -189 246 197 -205 246 205 -213 246 205 -230 246 205 -238 246 205 -246 246 205 -255 246 222 -255 255 238 -49 255 180 -74 255 189 -90 255 189 -106 255 189 -131 255 189 -148 255 197 -164 255 197 -180 255 205 -197 255 205 -222 255 222 -230 255 222 -238 255 222 -246 255 222 -246 255 222 -255 255 222 -255 255 238 -74 255 180 -90 255 189 -106 255 189 -123 255 189 -148 255 197 -164 255 197 -180 255 205 -197 255 213 -222 255 230 -238 255 238 -246 255 238 -246 255 238 -246 255 238 -255 255 238 -255 255 238 -255 255 238 diff --git a/graphics/misc/sunny_day/9.pal b/graphics/misc/sunny_day/9.pal deleted file mode 100644 index ee5169a71a..0000000000 --- a/graphics/misc/sunny_day/9.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 172 -16 0 172 -32 0 172 -57 0 172 -74 0 172 -90 0 172 -115 0 172 -131 0 172 -148 0 172 -172 0 172 -189 0 172 -205 0 172 -222 0 164 -238 0 172 -255 0 164 -255 24 164 -0 16 172 -16 16 172 -32 16 172 -57 16 172 -74 16 172 -90 16 172 -115 16 172 -131 16 172 -148 16 172 -172 16 172 -189 16 172 -205 16 172 -222 16 172 -238 16 164 -246 32 164 -255 41 164 -0 41 172 -16 41 172 -32 32 172 -57 32 172 -74 32 172 -90 32 172 -115 32 172 -131 32 172 -148 32 172 -172 32 172 -189 32 172 -205 32 164 -222 32 164 -230 49 164 -246 49 164 -255 57 172 -0 57 172 -16 57 172 -32 57 172 -57 57 164 -74 57 164 -90 57 164 -115 57 164 -131 57 164 -148 57 164 -164 57 164 -189 49 172 -205 57 164 -213 65 164 -230 65 164 -246 65 164 -255 74 164 -0 74 172 -16 74 172 -32 74 172 -57 74 164 -74 74 164 -90 74 164 -106 74 164 -131 74 164 -148 74 164 -164 74 164 -180 74 164 -197 82 164 -213 82 164 -230 82 172 -246 82 164 -255 90 172 -0 98 172 -16 90 172 -32 90 172 -57 90 164 -74 90 164 -90 90 164 -106 90 164 -131 90 164 -148 90 164 -164 90 164 -180 98 164 -197 98 164 -213 98 164 -230 98 164 -246 106 172 -255 106 172 -0 115 172 -16 115 172 -32 115 172 -57 115 164 -74 106 164 -90 106 164 -115 115 164 -131 115 164 -148 115 164 -164 115 164 -180 115 164 -197 115 164 -213 115 164 -230 123 164 -246 123 172 -255 123 172 -0 131 172 -16 131 172 -32 131 172 -57 131 164 -74 131 164 -90 131 164 -115 131 164 -131 131 164 -148 131 164 -164 131 164 -180 139 164 -197 131 164 -213 139 164 -230 139 164 -246 139 172 -255 139 172 -0 156 172 -16 156 172 -32 148 172 -57 148 164 -74 148 164 -90 148 164 -115 148 164 -131 148 164 -148 148 164 -164 148 164 -180 156 164 -197 148 164 -213 156 172 -230 156 172 -246 156 172 -255 172 180 -0 172 172 -16 172 172 -32 172 172 -57 164 164 -74 164 164 -90 164 164 -115 164 164 -131 164 164 -148 164 164 -164 164 164 -180 164 164 -197 172 172 -213 172 172 -230 172 172 -246 180 180 -255 189 189 -0 189 164 -16 189 172 -32 189 164 -49 189 164 -74 180 164 -98 180 164 -115 180 164 -139 180 164 -156 180 164 -164 180 164 -180 180 164 -197 180 172 -213 180 172 -230 189 172 -246 197 180 -255 197 189 -0 205 164 -16 205 164 -32 205 164 -57 205 164 -82 197 164 -98 197 164 -115 197 164 -131 197 164 -148 197 164 -172 197 172 -180 197 172 -197 197 172 -213 197 172 -230 197 172 -246 205 180 -255 213 189 -0 222 164 -16 222 164 -32 222 164 -65 213 164 -82 213 164 -98 213 164 -115 213 164 -139 213 164 -156 213 172 -172 213 172 -189 213 172 -197 213 172 -213 213 172 -230 213 172 -246 222 180 -255 222 189 -0 238 164 -16 238 164 -49 230 164 -65 230 164 -82 230 164 -98 230 164 -123 230 164 -139 230 164 -156 230 164 -172 230 172 -189 230 172 -197 230 172 -213 230 172 -230 230 172 -246 230 180 -255 230 189 -0 255 164 -32 246 164 -49 246 164 -65 246 164 -82 246 164 -106 246 164 -123 246 164 -139 246 172 -156 246 172 -180 246 180 -197 246 180 -205 246 180 -222 246 180 -238 246 180 -246 246 180 -255 246 189 -24 255 164 -41 255 164 -57 255 164 -74 255 164 -90 255 164 -106 255 164 -123 255 172 -139 255 172 -172 255 180 -189 255 189 -197 255 189 -213 255 189 -222 255 189 -238 255 189 -246 255 189 -255 255 189 diff --git a/graphics/misc/sunny_day/90.pal b/graphics/misc/sunny_day/90.pal deleted file mode 100644 index 3b9064bc06..0000000000 --- a/graphics/misc/sunny_day/90.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 246 -16 0 246 -41 0 246 -65 0 246 -90 0 246 -123 0 246 -139 0 246 -164 0 246 -189 0 246 -213 0 246 -246 0 246 -255 0 238 -255 16 222 -255 32 205 -255 49 197 -255 74 197 -0 24 246 -8 8 246 -32 8 246 -57 8 246 -82 8 246 -115 8 246 -139 8 246 -164 8 246 -189 8 246 -222 8 246 -246 8 246 -246 24 230 -255 41 213 -255 57 205 -255 74 205 -255 90 197 -0 49 246 -8 41 246 -49 49 230 -65 49 230 -90 49 230 -115 49 230 -139 49 230 -156 49 230 -180 49 230 -205 49 230 -230 49 230 -230 57 213 -238 65 205 -246 90 205 -255 90 205 -255 106 205 -0 74 246 -8 65 246 -49 65 230 -74 74 213 -90 74 213 -115 74 213 -131 74 213 -156 74 213 -172 74 213 -197 74 213 -213 74 213 -222 82 205 -238 98 205 -246 106 205 -255 106 205 -255 123 205 -0 98 246 -8 90 246 -49 90 230 -74 98 213 -98 98 205 -115 98 205 -131 98 205 -156 98 205 -172 98 205 -189 98 205 -205 98 205 -222 115 205 -238 115 205 -246 123 205 -255 131 205 -255 148 205 -0 123 246 -8 115 246 -49 115 230 -74 115 213 -98 115 205 -123 123 205 -139 123 205 -156 123 205 -172 123 205 -189 123 205 -205 123 205 -222 131 205 -238 131 205 -246 139 205 -255 148 205 -255 164 213 -0 148 246 -8 148 246 -49 139 230 -74 139 213 -98 139 205 -123 139 205 -139 139 205 -156 139 205 -172 139 205 -189 139 205 -205 139 205 -222 148 205 -238 148 205 -246 156 205 -255 164 213 -255 180 213 -0 172 246 -8 164 246 -49 164 230 -74 156 213 -98 156 205 -123 156 205 -139 156 205 -156 156 205 -172 156 205 -189 156 205 -205 156 205 -222 164 205 -238 172 205 -246 172 213 -255 180 213 -255 197 222 -0 197 246 -8 197 246 -49 180 230 -74 180 213 -98 172 205 -123 172 205 -139 172 205 -156 172 205 -172 172 213 -189 172 213 -213 172 213 -222 180 205 -238 180 213 -246 189 213 -255 197 213 -255 222 230 -0 222 246 -8 222 246 -49 205 230 -74 197 213 -98 189 205 -123 189 205 -139 189 205 -156 189 205 -172 189 213 -189 189 213 -213 189 213 -222 197 213 -238 197 213 -246 205 213 -255 222 230 -255 238 246 -0 246 246 -8 246 246 -49 230 230 -74 213 213 -98 205 205 -123 205 205 -139 205 205 -156 205 205 -172 213 213 -189 213 213 -213 205 205 -230 213 213 -238 213 213 -246 230 230 -255 238 238 -255 255 255 -0 255 230 -24 246 222 -57 230 213 -82 222 205 -115 222 205 -131 222 205 -148 222 205 -164 222 205 -180 222 205 -197 222 213 -213 230 213 -230 230 213 -238 230 213 -246 238 230 -255 246 238 -255 255 255 -16 255 213 -41 255 205 -65 238 205 -98 238 205 -115 238 205 -131 238 205 -148 238 205 -172 238 205 -180 238 213 -197 238 213 -213 238 213 -230 238 213 -238 238 213 -246 246 230 -255 246 238 -255 255 255 -32 255 205 -57 255 205 -90 246 205 -106 246 205 -123 246 205 -139 246 205 -156 246 205 -172 246 213 -189 246 213 -205 246 213 -230 246 230 -238 246 230 -246 246 230 -246 246 230 -255 255 238 -255 255 255 -49 255 197 -74 255 197 -90 255 197 -106 255 205 -131 255 205 -148 255 205 -164 255 213 -180 255 213 -197 255 213 -222 255 230 -238 255 238 -246 255 238 -246 255 238 -255 255 238 -255 255 238 -255 255 255 -74 255 197 -90 255 197 -106 255 197 -123 255 205 -148 255 205 -164 255 213 -180 255 213 -197 255 222 -222 255 230 -238 255 238 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/91.pal b/graphics/misc/sunny_day/91.pal deleted file mode 100644 index 0cc9cb2268..0000000000 --- a/graphics/misc/sunny_day/91.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 255 -16 0 255 -41 0 255 -65 0 255 -90 0 255 -115 0 255 -139 0 255 -156 0 255 -189 0 255 -205 0 255 -230 0 255 -255 0 255 -255 16 238 -255 32 222 -255 49 213 -255 74 213 -0 24 255 -24 24 246 -41 24 246 -65 24 246 -90 24 246 -106 24 246 -139 24 246 -156 24 246 -180 24 246 -197 24 246 -222 24 246 -246 24 246 -255 41 238 -255 57 222 -255 74 213 -255 90 213 -0 49 255 -24 49 246 -57 57 230 -74 57 230 -98 57 230 -115 57 230 -131 57 230 -156 57 230 -172 57 230 -189 57 230 -213 57 230 -230 57 230 -238 65 222 -246 90 222 -255 90 213 -255 106 213 -0 74 255 -24 65 246 -57 74 230 -82 82 222 -98 82 222 -115 82 222 -131 82 222 -156 82 222 -172 82 222 -189 82 222 -205 82 222 -222 82 222 -238 98 222 -246 106 222 -255 106 222 -255 123 213 -0 90 255 -24 90 246 -57 98 230 -82 98 222 -115 115 222 -131 115 222 -148 115 222 -156 115 222 -172 115 222 -189 115 222 -205 115 222 -222 115 222 -238 115 222 -246 123 222 -255 131 222 -255 148 213 -0 123 255 -24 115 246 -57 115 230 -82 115 222 -115 131 222 -131 131 222 -148 131 222 -156 131 222 -172 131 222 -189 131 222 -205 131 222 -222 131 222 -238 131 222 -246 139 222 -255 148 222 -255 164 222 -0 139 255 -24 139 246 -57 139 230 -82 139 222 -115 148 222 -131 148 222 -148 148 222 -164 148 222 -172 148 222 -189 148 222 -205 148 222 -222 148 222 -238 148 222 -246 156 222 -255 164 222 -255 180 222 -0 164 255 -24 156 246 -57 156 230 -82 156 222 -115 164 222 -131 164 222 -148 164 222 -164 164 222 -180 164 222 -189 164 222 -205 164 222 -222 164 222 -238 172 222 -246 172 222 -255 180 222 -255 197 230 -0 189 255 -24 180 246 -57 172 230 -82 172 222 -115 172 222 -131 172 222 -148 180 222 -164 180 222 -180 180 222 -197 180 222 -205 180 222 -222 180 222 -238 180 222 -246 189 222 -255 197 230 -255 222 238 -0 213 255 -24 205 246 -57 197 230 -82 189 222 -115 189 222 -131 189 222 -148 189 222 -164 189 222 -180 197 222 -197 197 222 -213 197 222 -222 197 222 -238 197 222 -246 205 230 -255 222 238 -255 238 246 -0 238 255 -24 230 246 -57 213 230 -82 205 222 -115 205 222 -131 205 222 -148 205 222 -164 205 222 -180 205 222 -197 213 222 -213 213 230 -230 213 230 -238 213 230 -246 230 238 -255 238 246 -255 255 255 -0 255 255 -24 246 246 -57 230 230 -82 222 222 -115 222 222 -131 222 222 -148 222 222 -164 222 222 -180 222 222 -197 222 222 -213 230 230 -230 222 222 -246 238 238 -255 246 246 -255 255 255 -255 255 255 -16 255 238 -41 255 230 -65 238 222 -98 238 222 -115 238 222 -131 238 222 -148 238 222 -172 238 222 -180 238 222 -197 238 222 -213 238 230 -238 246 238 -246 246 238 -255 246 246 -255 255 255 -255 255 255 -32 255 222 -57 255 213 -90 246 213 -106 246 213 -123 246 213 -139 246 222 -156 246 222 -172 246 222 -189 246 222 -205 246 230 -230 246 238 -246 255 246 -246 255 246 -255 255 246 -255 255 255 -255 255 255 -49 255 213 -74 255 213 -90 255 213 -106 255 213 -131 255 213 -148 255 222 -164 255 222 -180 255 222 -197 255 230 -222 255 238 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 255 205 -90 255 205 -106 255 213 -123 255 213 -148 255 213 -164 255 222 -180 255 222 -197 255 230 -222 255 238 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/92.pal b/graphics/misc/sunny_day/92.pal deleted file mode 100644 index 554b2c1711..0000000000 --- a/graphics/misc/sunny_day/92.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -16 16 255 -32 16 255 -49 16 255 -74 16 255 -90 16 255 -115 16 255 -139 16 255 -156 16 255 -172 16 255 -197 16 255 -213 16 255 -238 16 255 -255 16 255 -255 32 246 -255 49 230 -255 74 222 -16 32 255 -41 41 255 -57 41 255 -74 41 255 -98 41 255 -115 41 255 -131 41 255 -156 41 255 -172 41 255 -189 41 255 -205 41 255 -230 41 255 -255 41 255 -255 57 238 -255 74 230 -255 90 222 -16 57 255 -41 57 255 -65 65 238 -82 65 238 -98 65 238 -115 65 238 -131 65 238 -156 65 238 -164 65 238 -180 65 238 -205 65 238 -222 65 238 -238 65 238 -246 90 230 -255 90 230 -255 106 222 -16 74 255 -41 74 255 -65 90 238 -98 98 238 -115 98 238 -131 98 238 -139 98 238 -156 98 238 -172 98 238 -189 98 238 -205 98 238 -222 98 238 -238 98 238 -246 106 230 -255 106 230 -255 123 222 -16 98 255 -41 98 255 -65 106 238 -98 115 238 -115 115 238 -131 115 238 -148 115 238 -164 115 238 -172 115 238 -189 115 238 -205 115 238 -222 115 238 -238 115 238 -246 123 230 -255 131 230 -255 148 230 -16 115 255 -41 115 255 -65 123 238 -98 131 238 -115 131 238 -131 131 238 -148 131 238 -164 131 238 -172 131 238 -189 131 238 -205 131 238 -222 131 238 -238 131 238 -246 139 230 -255 148 230 -255 164 230 -16 139 255 -41 139 255 -65 139 238 -98 148 238 -115 148 238 -131 148 238 -148 148 238 -164 148 238 -180 148 238 -189 148 238 -205 148 238 -222 148 238 -238 148 238 -246 156 230 -255 164 230 -255 180 230 -16 156 255 -41 156 255 -65 156 238 -98 164 238 -115 164 238 -131 164 238 -148 164 238 -172 172 238 -180 172 238 -197 172 238 -205 172 238 -222 172 238 -238 172 238 -246 172 230 -255 180 238 -255 197 238 -16 180 255 -41 172 255 -65 172 238 -98 172 238 -115 172 238 -131 180 238 -148 180 238 -172 180 238 -180 180 238 -197 180 238 -213 180 238 -222 180 238 -238 180 238 -246 189 238 -255 197 238 -255 222 246 -16 197 255 -41 197 255 -65 189 238 -98 189 238 -115 189 238 -131 189 238 -148 189 238 -172 197 238 -180 197 238 -197 197 238 -213 197 238 -222 197 238 -238 197 238 -246 205 238 -255 222 246 -255 238 246 -16 222 255 -41 213 255 -65 205 238 -98 205 238 -115 205 238 -131 205 238 -148 205 238 -172 205 238 -180 213 238 -197 213 238 -213 213 238 -230 213 238 -238 213 238 -246 230 246 -255 238 246 -255 255 255 -16 238 255 -41 238 255 -65 222 238 -98 222 238 -115 222 238 -131 222 238 -148 222 238 -172 222 238 -180 222 238 -197 222 238 -213 230 238 -238 238 246 -246 238 246 -255 246 246 -255 255 255 -255 255 255 -16 255 255 -41 255 255 -65 238 238 -98 238 238 -115 238 238 -131 238 238 -148 238 238 -172 238 238 -180 238 238 -197 238 238 -213 238 238 -238 246 246 -246 246 246 -255 255 255 -255 255 255 -255 255 255 -32 255 238 -57 255 230 -90 246 230 -106 246 230 -123 246 230 -139 246 230 -156 246 230 -172 246 230 -189 246 238 -205 246 238 -230 246 246 -246 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 255 230 -74 255 230 -90 255 230 -106 255 230 -131 255 230 -148 255 230 -164 255 230 -180 255 230 -197 255 238 -222 255 246 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 255 222 -90 255 222 -106 255 222 -123 255 222 -148 255 230 -164 255 230 -180 255 230 -197 255 238 -222 255 246 -238 255 246 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/93.pal b/graphics/misc/sunny_day/93.pal deleted file mode 100644 index 15f97e8b51..0000000000 --- a/graphics/misc/sunny_day/93.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -32 32 255 -49 32 255 -65 32 255 -82 32 255 -98 32 255 -115 32 255 -131 32 255 -156 32 255 -164 32 255 -189 32 255 -205 32 255 -222 32 255 -238 32 255 -255 32 255 -255 49 246 -255 74 238 -32 49 255 -57 57 255 -65 57 255 -82 57 255 -106 57 255 -115 57 255 -131 57 255 -156 57 255 -164 57 255 -180 57 255 -205 57 255 -213 57 255 -230 57 255 -255 57 255 -255 74 246 -255 90 238 -32 65 255 -57 74 255 -90 90 246 -98 90 246 -115 90 246 -131 90 246 -139 90 246 -156 90 246 -172 90 246 -189 90 246 -205 90 246 -213 90 246 -230 90 246 -246 90 246 -255 90 246 -255 106 238 -32 82 255 -57 90 255 -90 106 246 -106 106 246 -115 106 246 -131 106 246 -148 106 246 -156 106 246 -172 106 246 -189 106 246 -205 106 246 -213 106 246 -230 106 246 -246 106 246 -255 106 246 -255 123 238 -32 106 255 -57 106 255 -90 115 246 -106 123 246 -123 123 246 -131 123 246 -148 123 246 -164 123 246 -172 123 246 -189 123 246 -205 123 246 -213 123 246 -230 123 246 -246 123 246 -255 131 246 -255 148 238 -32 115 255 -57 123 255 -90 131 246 -106 131 246 -123 139 246 -139 139 246 -156 139 246 -164 139 246 -180 139 246 -189 139 246 -205 139 246 -222 139 246 -230 139 246 -246 139 246 -255 148 246 -255 164 238 -32 139 255 -57 139 255 -90 148 246 -106 148 246 -123 148 246 -139 156 246 -156 156 246 -172 156 246 -180 156 246 -197 156 246 -205 156 246 -222 156 246 -230 156 246 -246 156 246 -255 164 246 -255 180 238 -32 156 255 -57 156 255 -90 164 246 -106 164 246 -123 164 246 -139 164 246 -156 172 246 -172 172 246 -180 172 246 -197 172 246 -213 172 246 -222 172 246 -230 172 246 -246 172 246 -255 180 246 -255 197 246 -32 172 255 -57 172 255 -90 172 246 -106 172 246 -123 180 246 -139 180 246 -156 180 246 -172 189 246 -189 189 246 -197 189 246 -213 189 246 -222 189 246 -238 189 246 -246 189 246 -255 197 246 -255 222 246 -32 189 255 -57 189 255 -90 189 246 -106 189 246 -123 189 246 -139 189 246 -156 197 246 -172 197 246 -189 205 246 -205 205 246 -213 205 246 -230 205 246 -238 205 246 -246 205 246 -255 222 246 -255 238 255 -32 205 255 -57 205 255 -90 205 246 -106 205 246 -123 205 246 -139 205 246 -156 205 246 -172 213 246 -189 213 246 -205 213 246 -230 230 246 -238 230 246 -246 230 246 -246 230 246 -255 238 255 -255 255 255 -32 222 255 -57 222 255 -90 222 246 -106 222 246 -123 222 246 -139 222 246 -156 222 246 -172 222 246 -189 222 246 -205 230 246 -230 238 246 -246 246 255 -246 246 255 -255 246 255 -255 255 255 -255 255 255 -32 246 255 -57 238 255 -90 230 246 -106 230 246 -123 230 246 -139 230 246 -156 230 246 -172 230 246 -189 238 246 -205 238 246 -230 246 246 -246 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -32 255 255 -57 255 255 -90 246 246 -106 246 246 -123 246 246 -139 246 246 -156 246 246 -172 246 246 -189 246 246 -205 246 246 -230 246 246 -246 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 255 238 -74 255 246 -90 255 238 -106 255 246 -131 255 246 -148 255 246 -164 255 246 -180 255 246 -197 255 246 -222 255 246 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 255 230 -90 255 230 -106 255 230 -123 255 238 -148 255 238 -164 255 238 -180 255 238 -197 255 246 -222 255 246 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/94.pal b/graphics/misc/sunny_day/94.pal deleted file mode 100644 index 0036d47e02..0000000000 --- a/graphics/misc/sunny_day/94.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -49 49 255 -65 49 255 -74 49 255 -90 49 255 -106 49 255 -123 49 255 -139 49 255 -156 49 255 -164 49 255 -180 49 255 -197 49 255 -213 49 255 -230 49 255 -238 49 255 -255 49 255 -255 74 246 -49 65 255 -74 74 255 -90 74 255 -106 74 255 -115 74 255 -131 74 255 -139 74 255 -156 74 255 -172 74 255 -189 74 255 -197 74 255 -213 74 255 -230 74 255 -246 74 255 -255 74 255 -255 90 246 -49 82 255 -74 90 255 -90 90 255 -106 90 255 -115 90 255 -131 90 255 -148 90 255 -156 90 255 -172 90 255 -189 90 255 -197 90 255 -213 90 255 -230 90 255 -238 90 255 -255 90 255 -255 106 246 -49 90 255 -74 106 255 -90 106 255 -106 106 255 -123 106 255 -131 106 255 -148 106 255 -164 106 255 -180 106 255 -189 106 255 -205 106 255 -213 106 255 -230 106 255 -246 106 255 -255 106 255 -255 123 246 -49 115 255 -74 115 255 -90 123 255 -106 123 255 -131 131 255 -139 131 255 -148 131 255 -164 131 255 -180 131 255 -189 131 255 -205 131 255 -213 131 255 -230 131 255 -246 131 255 -255 131 255 -255 148 246 -49 123 255 -74 131 255 -90 131 255 -106 139 255 -131 139 255 -148 148 255 -156 148 255 -172 148 255 -180 148 255 -197 148 255 -205 148 255 -222 148 255 -230 148 255 -246 148 255 -255 148 255 -255 164 246 -49 139 255 -74 148 255 -90 148 255 -106 156 255 -131 156 255 -148 156 255 -164 164 255 -172 164 255 -189 164 255 -197 164 255 -213 164 255 -222 164 255 -230 164 255 -246 164 255 -255 164 255 -255 180 255 -49 156 255 -74 164 255 -90 164 255 -106 164 255 -131 164 255 -148 172 255 -164 172 255 -180 180 255 -189 180 255 -205 180 255 -213 180 255 -222 180 255 -230 180 255 -246 180 255 -255 180 255 -255 197 255 -49 172 255 -74 180 255 -90 172 255 -106 180 255 -131 180 255 -148 180 255 -164 189 255 -180 189 255 -197 197 255 -205 197 255 -213 197 255 -230 197 255 -238 197 255 -246 197 255 -255 197 255 -255 222 255 -49 189 255 -74 189 255 -90 189 255 -106 189 255 -131 189 255 -148 197 255 -164 197 255 -180 205 255 -197 205 255 -222 222 255 -230 222 255 -238 222 255 -246 222 255 -246 222 255 -255 222 255 -255 238 255 -49 197 255 -74 205 255 -90 205 255 -106 205 255 -131 205 255 -148 205 255 -164 213 255 -180 213 255 -197 213 255 -222 230 255 -238 238 255 -246 238 255 -246 238 255 -255 238 255 -255 238 255 -255 255 255 -49 213 255 -74 213 255 -90 213 255 -106 222 255 -131 222 255 -148 222 255 -164 222 255 -180 222 255 -197 230 255 -222 238 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 230 255 -74 230 255 -90 230 255 -106 230 255 -131 230 255 -148 230 255 -164 230 255 -180 238 255 -197 238 255 -222 246 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 246 255 -74 246 255 -90 246 255 -106 246 255 -131 246 255 -148 246 255 -164 246 255 -180 246 255 -197 246 255 -222 246 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -49 255 255 -74 255 255 -90 255 255 -106 255 255 -131 255 255 -148 255 255 -164 255 255 -180 255 255 -197 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 255 246 -90 255 246 -106 255 246 -123 255 246 -148 255 246 -164 255 246 -180 255 246 -197 255 246 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/sunny_day/95.pal b/graphics/misc/sunny_day/95.pal deleted file mode 100644 index 3b8bceb353..0000000000 --- a/graphics/misc/sunny_day/95.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -74 74 255 -82 74 255 -98 74 255 -106 74 255 -123 74 255 -131 74 255 -148 74 255 -156 74 255 -172 74 255 -180 74 255 -197 74 255 -205 74 255 -222 74 255 -230 74 255 -246 74 255 -255 74 255 -74 90 255 -90 90 255 -106 90 255 -115 90 255 -123 90 255 -139 90 255 -148 90 255 -164 90 255 -172 90 255 -189 90 255 -197 90 255 -205 90 255 -222 90 255 -230 90 255 -246 90 255 -255 90 255 -74 98 255 -90 106 255 -106 106 255 -123 106 255 -131 106 255 -139 106 255 -156 106 255 -164 106 255 -180 106 255 -189 106 255 -197 106 255 -213 106 255 -222 106 255 -230 106 255 -246 106 255 -255 106 255 -74 115 255 -90 115 255 -106 123 255 -123 123 255 -139 123 255 -148 123 255 -156 123 255 -172 123 255 -180 123 255 -189 123 255 -205 123 255 -213 123 255 -222 123 255 -238 123 255 -246 123 255 -255 123 255 -74 123 255 -90 131 255 -106 131 255 -123 139 255 -148 148 255 -156 148 255 -164 148 255 -172 148 255 -180 148 255 -197 148 255 -205 148 255 -213 148 255 -230 148 255 -238 148 255 -246 148 255 -255 148 255 -74 139 255 -90 139 255 -106 148 255 -123 148 255 -148 156 255 -164 164 255 -172 164 255 -180 164 255 -189 164 255 -197 164 255 -213 164 255 -222 164 255 -230 164 255 -238 164 255 -246 164 255 -255 164 255 -74 148 255 -90 156 255 -106 156 255 -123 156 255 -148 164 255 -164 172 255 -180 180 255 -189 180 255 -197 180 255 -205 180 255 -213 180 255 -222 180 255 -230 180 255 -238 180 255 -246 180 255 -255 180 255 -74 164 255 -90 164 255 -106 164 255 -123 172 255 -148 172 255 -164 180 255 -180 189 255 -197 197 255 -205 197 255 -213 197 255 -222 197 255 -230 197 255 -238 197 255 -246 197 255 -246 197 255 -255 197 255 -74 172 255 -90 172 255 -106 180 255 -123 180 255 -148 189 255 -164 189 255 -180 197 255 -197 205 255 -222 222 255 -230 222 255 -230 222 255 -238 222 255 -246 222 255 -246 222 255 -255 222 255 -255 222 255 -74 189 255 -90 189 255 -106 189 255 -123 189 255 -148 197 255 -164 197 255 -180 205 255 -197 213 255 -222 230 255 -238 238 255 -238 238 255 -246 238 255 -246 238 255 -255 238 255 -255 238 255 -255 238 255 -74 197 255 -90 197 255 -106 205 255 -123 205 255 -148 205 255 -164 213 255 -180 213 255 -197 222 255 -222 230 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 213 255 -90 213 255 -106 213 255 -123 213 255 -148 213 255 -164 222 255 -180 222 255 -197 230 255 -222 238 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 222 255 -90 222 255 -106 222 255 -123 222 255 -148 230 255 -164 230 255 -180 230 255 -197 238 255 -222 246 255 -238 246 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 238 255 -90 238 255 -106 238 255 -123 238 255 -148 238 255 -164 238 255 -180 238 255 -197 246 255 -222 246 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 246 255 -90 246 255 -106 246 255 -123 246 255 -148 246 255 -164 246 255 -180 255 255 -197 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -74 255 255 -90 255 255 -106 255 255 -123 255 255 -148 255 255 -164 255 255 -180 255 255 -197 255 255 -222 255 255 -238 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/weather/drought/0.gbapal b/graphics/weather/drought/0.gbapal new file mode 100644 index 0000000000000000000000000000000000000000..e8249d55a5c27be0e31fc2c2c6aeadb7bdd15c3f GIT binary patch literal 8192 zcmX}pXIRq*!>DmcppwDLU}OSW#Xy*n5UL3Q$s~{gA%j2$rWpbm8Z!UA`nFE$Kt)7~ zNcHjf+WPp|Wvw;6e63aL)*_`8sY*E%9=A457Ndx1h*8C;W3(~NF)c9%;0NPA zi8~y3B<^V3vAECT{uT3i%$}ING5ccn$9x=fAm%Ro_qh9U({VF#vvG5A^KnmN{)%}X zb0=mY=1t6RF?VB#iP`a_cuG7iJ~y5opC4ZoTN1k>mKj?fi;Z0w%ZY7CG{l?Y+u|+p z)_8mT+W4KZyJFYHdSiXDf!I(i5PKl;VEiZXhvSdLAB{g2|5^Nv*juqb$9^6AP3*6+ z-^E5^?;kOR~Xa)R8T z29OG*25CXfpcYU|(hz7EbQp95bQJU{=s4&E=yTAQpuM1dp#7kaK?gtwlBPiSK+~WZ z&@5;U^bqtI^c3_Q^b)iH`W5sW=q~7PQWiJ|Oa{}yx!^o716&9$2Co1!!R6ozFdobS zN0VB?Mz9%d0b9X#a67mY>;ikhUa$`w0EfT;n3FsN9tIx<9|0c)9|Io;p8%f(e+m8? z{0;b9@OR({7)YK1-vdvBXTY=IIq*FAG59I?8TbWw0sIF1H#iE8B;QY-PM%4gO`c1h zPkxyEIQePvv*Z`auaaLUFD5S~N0YPRBsc|5gXhBO@O*eG90^A!q$gx1U=#2O!~_6k zfScfLa0}cDx5K3g^$CiEh6GiDIzgMzoG_RYK^=sD0zV8t0zV2r20xx~BH{CdJqddg z_9g63_&8xQC5rkTejh#!pMlT9=im<$9w+>j@I2vV!Y>KGCj6E_Nadij6G@4bL|S5Q zB0Z4-DTI_jRzR4LOh^S}B}AXvf;J?Y65A3jiPl7W;x@<*$S%k_h!^661Rx>EU}^+? zF!3DZ2gr|*5y)l8RmgS7Ey&N1JCI)>-$K5FOs3vNXF);Gc<3@H1PX^HK~tbeC>oj$ zU4XoS;GqNrF|8G9gtkE~P%G2{ZHIP3-OvW83aW-`p(~+!L`&KbbQpRVdIWkDdJK9T zdII`6^h@a1(0$PT(2t>mhy!U;(0kAa&>83~bPoCu`WX5Y`W*Ta`U~_|=x@+T#ND(k zSPqN~qrq}vbQl9x2rGuIfH7g^unHI+MnDqNTVY0+8D@c5VRl$MtP|#ft%G@CK3D)2 zg6WYh=|iw#*df>v*iqOq*k`a4u#>PaU|+$$fqe`64mOB9kUj-FkGz1qh#Wy)MqWi; zN8Uo-M&3b=A;*!wAt#ZM^!v!^^qKV8^ttr;^hfDW(x0Y3OMj96D*bi(V){~gG(8(d zLQzmOR4$5+%15Q5kSH`N9hI4aO~IpxC;(?bnNV#g3(AVJqok;MlmgX&Ql+RA*uqo_|&$5AIxJt=!q_NMGh*`G3zF_{s?{f@einnul_W>J5l9-MspYBIR9&V%6TlnLCiI8s zjp!}tZuB;EC)$;|F4ddrOAVwBWDaH?z#l}PL;ryO5q$}L8GRLf9ep$P=hQo?-=uz< zI*~brKBMcXhb?96M;qGFa!*d(3)mUt48n{aY_>`m-#>?n2&JC2>ePGTd(``BsX3~`n?N1P`< zB0eVmMSMj#eg^AKg4guZ^n1y+wq-v7v6*SX8Q2`*#p^w*%8V?{5kv&_#g3? z@R#vd@z?Pu@wf3`XMTep&z{Jh%#KpB2p~c{VHp8JfDw`iDFg%oMM%eF5->Tq96}C} z+Db4IstJ68kRT>V3H1ayK}k?y)C5hAE=Ql!LLDLu6AlqJ5;haI61EX`5PAr^341a7 z2>m$&IfFR|s8g7Gga?>EFteCB%sl2X<|*bm<|XDA!g$U^&ScJAY8EjEOUBZOxkNfK zpIAsNCYBPJ#Bw5rgd-71L|QA+h&5vcBoRqMl9K94a*~qNNK%tDBppdlYM~8bhp`(- zn@C$o-K1@#9i$%8Zc;C)kJL{ZAPtfL+7$LY=>q8@=_k@<(lyd`(k;?$(kN++G*0@B zG)aok?vtizGqhRS9BrQVi1vi`7wsAC1??5>HEof$M2ph0$s{s`Oe5!#>EwKJ>f1;% znw(C~BxA{VGLa1A8OSDb8`(m(lI>*a+x27xxq+-AtI1k&GkNgsNZvv6C*;HABjlsx zPv1UHK0)pw?;-Cc?<4OgPrN<(b~NvI@_q6&d4@bo{*(NW{FwZd{EU2uygySATd5yWcTjt%yQ#g@zUBSP2bK>mKfsux-lIOC{z1J&{fT;odYyWcdYd{* z9a}!Wd}8_J^1F;IS`LX!qtT#rI6aA;LPyY1^fY<~9Ye>_33OsXE6GSRlLT}TT|$@A z>*;d3lHN#fqHE|nx}M%rFhm=sZJ=+WZ=rY7x6^mfd+2-Uz4ShMKYf5cNCyh0Xy@q{ z=ojfD^vm?C^y~DS^xO1N`WStjK0%+PM+)xKr|B~VvjuYn^97Fzo)r95@Vwwf!K;GT z1&aks1<``+JW?JdkCvC4N6*X8OD#keq6^dWG7GVJ_&j1BP-@6C<+bHm@~nCGJZWKl zp`x%MPnD<6)8;kj4Hia959WQ6cewCK;nBiR3y&9`DD27Gleaf-U*7(_iPFi!XzA~H z_w%L;X9{Nv|15l1_&D!r-m|E@ zZz|Fh>5BA4zzRdYDgVQwjYXS_?D_5ao%ybOPkwJvUr~S2K+)M1krfB?&lUYp^ke>| z{Gal#=3mc0ng2!pXwg{Fc+o`B_{pLKu{tok(5YFWF_(vWl3X6Q;DWTSE6UO zFoz0;3pSK&D%n!fU9!DoN6D^|-6g#xeI@-R10{pZ1I(#{^CcHbE|!dxTwz{g-eBHj z{>;3?9Al0%CzzAW2=ji)G;^k8mO00qXFg&+VgAK@&V0dq#eB_NWG*qI%l8$qpVL^$5|&>J*+*fy{vt#{iPGENmlfo-%IbYrdczrS=JouA?q>gDeD>Q zPU%7^rW{vJSjkzLy@FRxDW{d^meb1_<%Q+N<)tgiRy37s%5^LC<-khAiucPuEZRM)u~it!3NTJJ>z!-Rxd=AG@DDuxfBsWYtvJJ@y0k zA7z)yF0-$)ud{EmZ?i|)W9)JE#Hz_vcUNUGb1KM88WUOpuSlv$sX$bqD$*)4Dlio| z4uM1Dv{o3IW~QJ*R3WL5R@7I>E0h(D6-^bI3LQt!Y2gephnX8HHdSn?=&sn#*~!_( z+0EI@>ErZs1~`M91Dq-5`HBk_7b`|8u2fv(+~C~e{LC5UjB&;}6P!uTUC#ZA>57?( zSiFtq)sSjlNC9aZC$yv=^ol{Avq*dlt z(kmI2g_XsXrIlrsO_iETU8TMfSpDAW_bWfFv{YIv?Un77ot3UiPi1dqUuFO5fy%S1 zBdfn(eXjC{${#B)RsK}@S>=h!la;qCM=QrF$14|CFRhNQ&Z+_N;(5z>5FU(|$V=fN zcqm?3O$Lu$^G?mG8ct0s&&aFh@p(d?m{-fI=gE0WUSmxYPgA3-3D*EML%d<$A>Kyb zX5LobHr@_i4{tZGx2BKRUo%j1wkA?D#kU`COs*6=4 zRadI6Ro&p<;{VLQ!~cap&Y$2<^6&ERS4~&VRLxe+@#p!E_)qwM@t^Zw@?Y^^^B4I` z{3t(00+Pf_mPsHIxFkuEB0);fl5|0)04u-?hyp;+D&a|1OZXC@L?V$&>Lm(EgG41z z3$%h}!Js4}7?KQ2J`ijaY!+-4Y!mDd^a%C{_6qh1_6sHilY*#ZN^(!~Krkbi70e0d z1&;+!1P2#q zQnX&$B=Spx(y%nrI3yYt9TII6Z5C}6Z4>Pf^@w(hdZm4$)6xOyS?S%zDbYRA1JNI% zOQOr7tD+mCThiOoQR$dyTsk40loC~0;v6wqOcO)JaB-42MT`)m#A)ITF{TbzN2ued zTE#}OnJ*BF#1gSoEE6m08tNMBn(8!lx;lLwpc)bn^EZe$iMNQm#oNU@#k=bE)b-Z& z)%Dj6)D6}hP)&)?i!X>Tibup(#MkO>)ZME4x$aKgSlxKtMBQZFUDbW@w0K55E1nb2 ziyzfJse7(^p?alSP`yzts+LqyRg4m(j8iUCLXm&6;%3C>QE6GMtPccS^~w5W1G2LXk%sRZ&NZBG z_)&ILc1(6vc3pN;c3UR{1vh4tbA! zx4c(=s_}H=nZ`*?R6ixZ*Z4sGhy0TKviz$2hWwWNwtQ4R);Qj{*htV4Te1{63bKNx zfGXgMBt?n>p+KwBR2eFa3a477ZE0y$7!_uPKp|2{6jFsup-?rbRH`PGMx|4QwLr^| zVpy?3u}QH-(XH67*s0j1*rVF3>QnWr22_LE11(dE^NI_Ki;5A&6~#5h4b?5xsCG>I zi}qLTZ`w)i-In``X~m3URxziTS3FWZQ9akbY>0y`sIQy`jCO9W{-a#!bJPelty)?pp3^r?oTMS?!#5Ui(P3VwnkdtGrw>Cz`Vh{*}T>Kk$H!?$GqFzYu;zxZ=PtKY>l=~neUk& zm}kth<~j4c`LX$_`I-5JdBKcn!x;z$jv=cpr;Xf3YZDnH2C1RmAU7xtjfN(J#-KCk z4S?ajHe;K)&C<5T&~4ae*kR}~>^Afo`V9Ss0mE5C#PEIFxwi9dN7_aVmkn19*9|uf zw+*9)F~hiF(XeEQw#BRgt%+N+Yz@>1HzpZVj0hvjm}bl{vW@Q;SFPa~xodc9s@L$> zh>Q}W)L3tn8w46$eN)w!)rcRvvJK9W4Cdeafh+T_@(hH<0<25;~C@R zny77R&Al}b*37IKF(16)nc@mO#+k1Br!=%GLyp8U{aZUmVhN>58DrP44H;a8%&!_TTI=i z?WUckU8X&zQWSCwBPNx z-!g5QG0mFhO!KBkrYEN7mY4Pg`=yU9MOuRe!ZuH$L$34dbM}iea2PzU~OG%Tx(vt$-2ebZQW+wVePT*w)R^4to_yj z>sf2W`u*B-YY(lxXdSU$wqCVfx8AhgwvJlItmD>2>ykBUjcEt9$F(Qeptd|)lC8*A zY%8^u*;qEV?H$`H8^^|N=e1Y23v42r#3r>lZEo8-+j?7<&2J0Z!nR2Jd+o#RAGB|> zZLxLRw%K;tKDT{o`^t98cG`BvHrXC+pK8C?e!l&pZNzrjcGY&ncFXqM_R{vs_S%N; zAarotSsghY{7eTuCO=Q zRd!!TpyOlrpgZCn>KN|WVBcilV(+$Zx9_y?vhT5<>NwqT#{Hf9toyEas^h% z#D2wo&3?mv%RbsM)-m2O;r`7%>5h8uTc+(ZmRb9pect}a{>1*g<7LM}#~b(G-X(AJ z-^F-9o;c529*76#N%W+65FV5#&6DB5dhi~i2k7K_c%EucjYsGadul!P9+^k!Y4kLC zw4P?qpeNEfNm-f|{5p-#9n z$(iCrI8n|tXND8w#5oD;IL@qfIqPbi0;k9+aY~)_PPtR*Y;-m`HBOyV?*yE!>x}FE z;oRih;_P;AbMA2VICndHoqf)J=YaF9GvfSy-SD~#&Wq0f<^0q6$obg$)cMT$!uiVi z+PUalaz>po>p|zrTKiYm@6gUEQwjuAQ#WU0=GscAavacAareu8*#tT7Pc+ z1=mH_i0iWJk?V%*mg~7I!<*^FdhuR@m*dUy=6K(7C%B<*xI5XM>PEWJZkAW$)q0z~ zdN1H@^%}i3Zh>3mmbmNOGPlCr;O_GJy#wBly@TFJV8}b{-QeEj-s0|dZ+Gu>?{e>P zpYopep7DO?y&H%EQ{MCL3+{{V5%(4MHTMnoE%&H<%scL#@Gb?S|MvSG)9#s$*^ar6 zdG{mt6ZdoXOZS5JjrZ?=+y5yh2nxmp-wHy4uwY^^C5Q;3f@#6bAU22(5`#b&H~2x< zhOSLrTe`Ztwsr03>gn3u)!WtA)!#MHHP{vD8Va88y3lp8YozOP*VV4;T{pXKca3(9 zb&YpTbWL_eyQYG1zPEe{KBy1wOY)`o5I&SI&6nZB_;5agkK@YYu}=8$rts-gyZ~g`4jw5f4;xKU*s?Guke@oS$?+v z9sepn$IlI${Wbn~{UU#@zr*kJyZ!6@>-}ARzdz^?`y>AM!XNlI_&52t_&@Xi)Bi93 z=l)UunEx05ul@=Dq(AEaKK#Ic!GF;|;-B|l^FQ(bU?K1(@b`af6fgzN!8O5mgSMa}*dFW* zx`LkI`k*)H3kHIrAQ1c{csO_@cr^H*!Ow!ngC~L~gI@%{3Z4p{4xR~q7mNh&2d9HG z!P($k@Xz4G;N#%a;IrV1;H%(5@J;aVU^GYyQ9`s(ZipVr4;6$8L&c%eP+5o-Vuvb1 zD?^-+DbyCSgsdTZXl68f*ubZ90t8=4EvhaQEVg#HRW54{Mz3cU_3hL%Fn5I9T;FAL{} z>EZlvLAWSf5?&EzhFM{D_?_^oFeh9UULCfCtzmn3ZMY-s41XE^Dts#ZP59gJnef?g zB>W%Y55q^oo5RP#pN0P!{#W?t@XPS4@ayoK@M3r=91Z_h_=oV1;Y;D4!dJqN!cW3z zARQhO+yQ<8eg*#D-}}HcFayj2bHF_C2zUZK2VMdTz?=W?{~LyWqt5^U literal 0 HcmV?d00001 diff --git a/graphics/weather/drought/1.gbapal b/graphics/weather/drought/1.gbapal new file mode 100644 index 0000000000000000000000000000000000000000..145423a26786757ce7504ae71a02627cce1f6abe GIT binary patch literal 8192 zcmYkBX;_m7y7wUo0s&M=05!`4vV;&q2oNHK_| zSBN@97@`Zo2>y-72_Fzn5_$=Jgnq&R;Z(?(kWWM23wb}}Xh?U6j}Y8=kMIj&f-p&# zBFqqG2~R?vhAf4wgsg@HLi`~?0vMYdmJ*g0#t37EvBKD4b)gNRiqOJPL8vek4Aq5U zvCUzvVTLeMSbLZ`%o=to^kC?r(Dy>$4@E+;(C#o_?D4P%h2uxPQg{2KPJM zYq;Oz-o(9)JBT}k>%w_)2u_F7t<%Mw!=1|#QE3x4CUidHJ_ro8APlrDYe-!>Wd?9=>d^vn2d^J1}9t`)9 z#!2@{4@lFbhoo839BH1kKw2a%k)DyBlU|V4NI_C^bV_tuG$WcB&5CA6$3>H)6CyT8 zP$Fm%Km-`wy{S36HQEquif)fKNAHcUi)e^YM5rRv5t;}z+DGSYzKjl%fz9`#e~F%mo{XM~o{4@O{UqXP#8Skwh}#i&BG#h8 zc-`jYn3R~b7)A^;h80sAQy19~SrEA`QV=PO)W%@(*yiS#))+&KDW*Nf9P>%c+mQz& z4@Dl1^hP3)XpAr3xA}Msetp>bi1ozvG3z(3e-imL@_OXW$lH;3B7chU#|Jl;5KD<- zqLf%ktRc#Yb;NvP0dX6VLZlJt>%jzY%Rb_M;%|t*BfdubJ@HNA+r)!JH?foGC2EM; z^;iP77#IK3p5Wgc{AzmY1C*CBE632+g)^{iPwj@R2q6kspQIS#6Q5&LS zqsUPSQJbPDQ32xG`e1^8i$1C)sx8VC)gEPuvPE@7IilQAol)K>O_XQ@kO)wE!cRo~ zIjT3RFY2SHkE4d7PDgzj^;y*CQDaf)23?|#ayRP2hQDsOwBhRw-)#7H!{rU%Z}?%u zjSaUp+}`lh247+~<=%#g#L2{|#F@m|#JR-z#D&Dg#O1`5#MQ(=VldH18K>N*JfKWd z9#S4r9#iHi3zS95GUXZNIpqaqjS{3JlT*lPWCoc@W|7(CI5L@>K;BHIkZBtMGPtQb zshQkLHjqu^cCwkgmt03~AS=kKjp~h>jVRei^(P%Ce?UG-?j`q;2grluQ{;mi4{bcW z@yNzea)2770?GHtzmO-$ljJFKO#B@A3Hj;9rH#)v{*`E7|loX zB_EH+Crrdo#!tu3#?Qq+iN6+mJ@#hokFmGo1GFG5m|T)jnjlV)CR8R=C&&}(67u5; z;x@%?iK8S4=^!24x-VgW!hyI~;$Dk;J?_o8x8e@Qx#K$Hn&Q+62pywiThAq&Pq-L& zDemjIZ{og-yApRT?t0v3ai7P%pKz4kP4{h0BH>5`QaCA+6ir%BiY1Xq38YP=Eu`BC z0lJ^=->N6IkjhC?(hgEJNk-a9swXv)RHP=7Adv=u0Fcr{Izcidni5}1v?SUR_a?ra z=t_hVyAr*L2%rOWDR)U15_^F@pdT0j27w{qG;kIe21bBUU<~L6x>N2YP5_g@6fgtK z0&~DTumCIq%fJe-3Iu>4;7=I`?x#FRnNE3_@+jqT%6!T~%3{iL%1X-flou&$DZ!Lv zY6>-t%Ahi-EGnBCmqboVpl+s8s5B}-1(UinnyIZ+1Jy)rr<$pIlj^7qNeZfps-|kF zDAkwh&p1x~fO?YJOYNf$Bn?teQ4dlNQ4dp(P)DhO)L<&Wyhr_oIzgSJ5|d}CbJTh2 z0(FUcbJGe{kS0t6({#*aS_&gc5M;lEWOY^1qna62(`UGu~Hcfj-o1@LsuF|g4Zf?FsTTKh3 z1=E1c5_&0JOlQzD=~;9RolDQ7C(t)-*-RIt3)8`LFmoS$Km7pRL~o~C=r(!>-9dNL zJGbnjd()A0EFH@{M?X)$NWVn?JN+B_xAZIYtMu#i&$f)vN7KjBed)f;q+ipJu0IVM1 z1jPWfGt3Mt!_MenI2bMl#OPvp85)L;p<~^pTmX6*eT;s_0Ar9b#5m13%NS;iFh&_; zjBZ9Z>mD${m}E>bW*D=KImSF=fw9O~W~?w)839I+;bV<6?z0}SrdbbJk64dc^Q;Bd zB5RrTjP;!Lg0;p9vXWC%QqxiysmxSXDmyhUi=2^=u{nd1K}!Wv!Hn*l=G4|yL#ipY zJ=L7LH={12Aw!X&N>!(7Qqc@wmOtls>IbPOQ+reUQU@{yGfrh3%s7;BIQ2;CXht9_ zm<4d}rT&sSks84yGG{a9GUhWDQkPP1rmkcN*g`hQ)^U^5Qqt1WDwvhbYNnjYP0LH; zr74+RY%d#OV{9L#GaqF>&U})&n7N#}lD(Q8$PQ))3-pW@MmdAQ zU~$+S4u{LhF$f95cttv2!{&4vvchak@BO4#LrKbo{%F z3#?vFAE%!)z!~HWaZYp2a)vo0oKemgr<>EwzsH*3Ome0;Gn`q@9A}=hz**!hb5=O3 zoB$`t@$<(y_c;&prt@a`kNA)IPxuS`MgB5>h5wxYg1^QO@{_YtveL2`S2XhYP9L_nCGnx~~59R}f_p*M;3gb=YPv_6(&*jYLEaWWZ+{{_Y z5%7dOkf$q5W~Z>lJSne|Tg{box!gQ1kFDf(@w_~Qhw*%c&Foh8NnS7SHSX)&H@RE~oQ*G-;7xL;xevK>+$-Fx+#k5hycOOmFTe{H0-}Gw>{UAYs=l6>&SKGLIqs~-U6fm zE5bzQa?j^p%)OM|m;F)h$GM;6p3Xg+J6teQFj_EH;4AWplJanQguHc}>D<|Zxq|tE zg@VO`<${%h)q+4luqY_f=e2OkIgC6OpUvm+x%@mnkI&~9@&$Y$9~1y!59b8Oz-i~3 z`BuK2-@$kAU3`e&#rN_NJ|@tCcR3e0z5G6YKYxHf$RFaL=AY#c^GEoj{4u^y&<)

Xg1sB0(a0Pr0 zz5v(2Aefw=lAo5($YaadUoaiJ`<)@=}SlWN%4b zaYM19SXHdvrrCyW^A-C`j^}?+at!QtNqsS$KL|r1U2oa&B-I8-f=Zh{DT`KA;`lx77G$cALIx89$jfh4? zW1=rheUc;rPCyW>6HFJ)isnS~q6N{SXj!x(S``IEYo$SnUeF>a7cc}YkPUJ`E|>@M zKt5Oq3P2$!Dg&iGf)fIRpdB=WR?rT1fDX_FLSPr@1rZP}(@F0NE(m(TKCmAg00+S# z@HBW990o_gQE&`AR@N=OCzudSf>YoO_z1jQ_I=savLDKBl-(-3U3RDJr!v2E9J~)c z0H@1l%jU}FrB9?!rAyLf>56n!`a-%U4N5~Qa1~({;T6P+n2HS*aTVl>g!0YhlyX`* zP!5)Km+LD^E5sGjipq-W3VB6cMMH(6Tve_v*Oa3rzH)zgPsNFflNG%cA69%+F<5b` z;$Zoq^26mv%128A<-u}59J1r*iiwKJ^6B!2<#XlpQo`W>Y^ z#5<&7rZ`KSE#`{z#Jugw?OkH87!hM)-;SOgCwBa1$1CDj#jlIs5WgjUXZyR`hs7h} zQSq4AFAnYqsr-4z#Ewbv-^JgEzZG8*U){baUKX#2SH%G_y%MY}sVuD&S283_NtPsA z5?h)l;Ys+CLWw{klxQn4*}lsCk^>Txq+MbuwUu^A91@oVl5|PD5=4SlcFWF5&Py&z zE|vC`epEUr8IqiqoRthqMkJ$>G0B&eep!+fCnc1vE1NEzmCQ-zB@2>8$+BccvMLEk z)+&QCeOXIcc^RXOC1p!FQm!;l%9HY?g;If3C>2$K@}9C2WrnhLsaa~3+NB**htws7 zq+L?46p^A;nEY7;Z@IwO4~ zy)6B{>RQ$HsvA|es%}@^srsqPFCUlQmp+hAOJ}R*s^+T}G@@MiD`KtVdd`%vd zht%R~!)n88iM7$S8*1Zf$+Zc!n`nm`R*2G*6-mDZ)!F=R|xv~0bME6bDdWPDknOdu1=v~^hBzPkN& z2kK0+c9}(HlXb`(GM5aJb;-Q4qjksX{7vWT&dV;!F3I|2AISz~L$cGdv$A2?h-_3g zR`+FHuqjE7lN03YU&ia@=5uWd`A9Aep&v#{966>`WyAP>TlQIssE|o zuO6?uFMlAPme0!P^F?KNeySm0j(PuQ$HY_=m=K8sBXk zZX9VGZ5(U#HwGK;?)rJx_^wO4{@(aa<6Pr><3i(N<8tFl<7#7|k*)xnlA5+Qr8Y5| zA{EgJj)JSmQ}7ggMWI5V5Gu4ySku0y{Y?j&Oik?yi^8txP&gDW1*GUwcojz#$C~`w zb4}-)E;e0i>Qj8A7*q@?PAkqTh7}`?1XVqUSJSX3-4 zRurp>KoeaDw(6BF%5o(`$x^bF93@wor{pR5%0i_;DO789y4D`$38kUFU1?TYm3C!^ z(xG%IA!V1+t3=eOuDkWF@kGg;A?&yBf`CG^9?<*fDr^G<$9@phrU`b)9=*R z>lJ#HUai;Y(cQk?{@p!o`}GI(ujpUZzpj5n{|Eg$`giq*^+)uhy92v}y8+GJwx9Lm z`mgkV*Z+t9Tm5DIRs9e8oBEaA0*z1uYIK?s!`9~1=Je)DO|?d*snyhJ8Z=5xm&U6> zG?>Px*=N|_e4zQa&97+&G=rKU&1ub9&9G)fGpZTW_%%VzUBl1K7n{Fo{#rAunbXW` z7Bq{RWzC9aRTI$AwV*c1xV0s$G-OJExu3E@&6E%i0y~s#a(cnRI4-YfEc+>#vKPj{WO6&(-DWcsjnW zP$$r7Oj;9W?$Mpl8Px4Mv(Bos>pFA}ol6Jlx^!M0VmfB(Hs94<(Dmy2)cv{v-Jotr zcSiTAZp8Gt=?l}C=}VK(d`~^0n^aG!XLOHrmv!IkuIX;H-ZK4Y`lsoR=_ixlJg&a4 zexROK&+6uM^STAylIfZ0xp~$6!W=NKnSr&y<{?)jaH-G*kN=ST}H^*W%L@48jl(MFP*cUxBdC0USq#; zz&L0eGM+Y`H4Ym`jHAXo##4Vs2bXH1`(M$Dg^zc7!PeRjX&o@t_W(llk7X?p|JbY8|ust--SEb>6yQU9>J+SFEenfR%0oZAtE}?l2qE z#doo{b)>~?4zn4=r&flfdMd%N9ix7zLY4!gtd zvP1SGjz2k$I((4dd)INn-fQnO_uB{TgZ3f&8T+U95&P$kFC1eIKNR%dvrm{O%~R$X z^CSCZ`}g*1_8azFj#WnhT7!bW=Hur3<_G3!^Q?K!Ja1mGFWH|to;zMZYu@0069VI4 z0=y26grnf~@J2Wej)xQBEie@ZV9?pUw*+qOG<2FeU+Oe>+B)}kzTD~TggU!Ay`5;M z&*|UW1Aovt>6~)TIA@)6&Uxp8^Qm*$`OLZM3^;>MpyMw5ODDs{bg^7)7sthQ<+*sS z0@pTIkxS?TUAm4Wq^!&2YIm7kR+rt?;c~cKF38p8^12Wg=JIvyL;kg^*VX6hcMZ4( zT|=(ZuCuOT*NAJ>HRkfWf*t3O3tf}0Dc6i^)-~svcP+RUUCXW&*QzVvqPxMDlTf^e z;byv7Znm4_=DPFTJU8E6=oYwzZmk=8S&x=^Ozw8K*==>(-5u_O?swgPbie0*-+k15 z%)*)zV5!^zU98{zT;kV15gO|i)Ye3<(_fRy64>U?x*f0 zcOg^+2_PXPf^<*`mf~eVOo#=sAr8ca@}UA~7t{pphBOccb$ffTR<8+ahs=-_vO^t^ z6LLfEK}VoJK}R8<*N@%BE_i#PKBylWfCix<=nV8JGy;7NeF6RC4Prs;9y9?>I;I>m zjz`dC$M?`R#|`KfvAXkwekQ>M? zme@7;eNn{F{K^`F+J+U5=C*G6j+3cZss2;ip^n{{mC9AKoj@niDRc&Xgg*8>@jUhLy@lQ)Z?RYC6?t{u zWGoG1U`&kl>oGCMo9oT@D!seBUJS+%48yvyX3T(@uy)Lh*|5Fdm%UE!AHDB+-^a$V zFEJnH$Bttsv0khX>&HIEKJlLNp79QQN4%rho&WK751YUyu_iAG|O z4M;3PLgJAGWD~Llp(1nyK*|vbQh`(=)rbtKMRp?fNF$;^R7exD8_^&-XFA*Q|XXGp7Z^+lkKae@(G4cdiKo*f@P8{73-zKf zilP|Wh8od5=u4;-eG`2PeFwdc-av1mKcctMJLpfSAN@1>f6%|6AEE>3AbJJ8iY}p> zu+7*OjEd2IeGdWHMf5)U0G&o>(K&P;C1C~FHmnI#W4kd8rp0s^0b7S~A5$p57ODgRIW|K$Iv zKNC$v&#hQk@pi@X3eO5ppf|DxtwGnL8_;^R5#55epl#?%v;v)t&PB7)Y%Du!5dGii z&(Sx~|3KeDe~rG2zK_0)K7u}qhS3Nb!6H#83>xE)3BX`6!I%&X9utm z=mG3NR33(d*^J>~_?Qxm2qVUnV`LZwCL2S=02nXU6SW<)1M_>#`x4#ISJyX%KS_^Eu}4n6EH5F}E>yF!wO`F%K{gF^@0<7z78BMle5No?yl? z6PQWN3(QN*E6f|r9A*)-gz;hqaBk8l?g?%j_YC(l?ibt(+)Lam+zf6Ow}5+#TgG{D z1Eew1IO!SbXVN6;IcbVCO?pL|A|V|2J3vk>Wu_qYOrdo z7TbW;V+~j{)`Bg^%CK43Y-}zzH;f$x#tdRlU{7LCV|%fmV*9Y?u@|wQVUJ*sVqq*C zhD5nzP`FX-6YMy40{aVg3OkLR!OmhAun)11uzw31h#H8=!*Os0I3A9VE5V6yVq7^+ zhEw3Oaa7!Lm^aEBvmLhs_b%=|+%8-@ZZB>h?f|X>*NHodgK@cdHVL2&;;!L7$Ne4m z749bPHtr7Y9_~Kw0d5HQ2nXX45=a}tUB`cczk&Y>e-nQje+PdT|1JJI{15nt_(%8w zlAAV)A0s^_P5j&Uwa<6X=etN+^67eLW583|1npC z!$ZPf5oSVWL*_#k3FOGCXfPT{iVmlR$Au?^Cxsis&Eb;p@=#f5W+*FM6$wSVqX&{| z!!_Zbhu;YQNBFJqzVP$m7ehNjJ43s|k46qhd!ju_$HQqve_{X;M+_#05b?yB(Am)W z(4p{$kxS9uXdtrc9!;S%y2Z<+$ABUX^>ka!f z?9XB6!Y+n&gms2FiLNLp#vOwsqgIa+ABT;HO@vK`y$G8Qn+cl@n-3cz{#Vr1n1Psq z+uYHI({QQ6Hi+GHfkxx8{6YCG8`9NIFRBARQqcB|$WV2GU1XUtfKi)=N7> zJ4@@Mougf#U8H?RyF%-yU8N1s-1Je>810|JleFi*`Of_2yX4dL(8m&7aB{jzkY74JUb$ylKZN zv>5-Gcc@ruFg1i4MxCL|QXWu#h+a%uN&=GEjG7pAjF!ry@~I`%EmSeJoVt;kNzIC3 zCFdlwlR?H{%!!zfsi&yD)HBpSQ_oQ^Qah+^)NL`&lJ&Zhn1H=LeKoXDwtOwG7bRYxB1Quczlb4dc$zH~GUpB@5V!{Hq&3l-=|;Ml-b&v}x6EF&(P1(`{?KB7w8x1pV6<-`{`Hd19UfYlr~0xN}r%l(x20({=;{XzU0&O zFnx9X#QI6*FU%Lrm&|GAYvvo~EOVZ@$b8FOW_p>?v9#E@*o4@mSbFT*SbPdGB_c5@ zk(@|P1QNj%Pik$fCRQ7(i*1b6$F`(MQpyu$iHby3Y;|H!q9+yDa6I;-*psoRVn2yJ zo6?tZKJj2;M`CAef8xVLN*a&`Zul|wr`RX40c&w z%u6ng7siX?#qrYkjQCB-nG6;qhXFE>tig3Bl0Qy96~8OKJ$`Te{`dp&hvFT{ZHz7k z#6TGCEEIh-`El}i{Fm`J<8Q~`iN6$LFxN3tnG9w+a|3e|Gn2_;<}lezHfu29TEb3x z)B0wnk!fbOGPg2qOgpoU>10AogbA`n=-26|*Y`5dFwZjknCF-mn3tHJF|RQDnOB(u zOgC$E{n+}a%n9Zs^Eq?s|M)KXbUmywrmt?C-1wX|#d^tl#d^(p!{Xi5|@&Yl9WPES(}32MBEgS9+gf`r=|j_V7g~hZHgvEo1#l;Owp&bY?7pxr_0h6 z>8jM~)Sgt&CLrf{%10?DH=W+}r%h)!^`)OrKbYQ;+L_v)`Y@G}31osfKc@VY;-49i ziOXD>Ih8)0K9f3|I-eSqrp&C$1T)<^(Q9dIwV4f>{0$`=wrpUerKe@2Ri<@jc4c;F zx-&ibwQDtNKhM08*}LHnX&;! zopvwne%joI`Akw4B@4)9b852G8QKh9MlnOk5HZAzbVdeaQ$}W%GOH>J%tbhZ87DG6 z&N#)`#b{^jVeDfZVAvRrjLs})R(F;=*Udp~9L;#l7-xLRxXHN1xWl;1xX-wpaV4ui zYdFi3>*3^WkR8GtB-Y#b%Aw>b(wXA)z7-h8eqG*qs%eZQ`Q7)lJ$Z;#hzxrX1`(2vFF)~>?O9B z?cx4b+0WTi+?U)}+!^j0?i_cXyU2aZUFLeZ(do4Gxb%edq;z`v+H`yYF)t!7Dw~{5 z%?7f;Y)@Wox~4!|&`_W+Fc!2FNb<__WO<5gRd#iDkFNsx$J0M5IGJ}k?@xK3=Jn;B z&pVjik=>cypZzeKk`LsAn}1BlZ1&F|&zs2mC2uNkI&UU>HhbQ8`6~0P^1*!f=I9NY z&DwlkK0m)Ce@i|iCp{-4r!uEAzbn5x-<|K-T)W}FH=oQumEW7+p8rAq{+t7uhcYkc zJjfr)AI|sY1BJ&o&|XX6?pbah_Z;^E_Y(Iq_X@Y4dzCxDa|=dUW9+Bw z3GO8K1@|TI74J3g4R4OOz+2=k@w_~bz*o7x%6rb6;!O))31$Ru1apD~!J=SEuq^Nj zP(rlOUl<_730De3g?J%R7$J-*A{S8$fC8|Vh6$1&RlSCxj=3r-Z%2PlbKL^TLBg9Yvi*{RIyTD8)cASd1z`mpl=U7flrXQZ!XG zT{KfPTQFY`wOLtQ<*V-Eni6%%<`Q0UQgKT0`eH_LdU3|)%FUg{UB%tL>M0p4IZ<-5 z= zukb+Op+X10li$Vf=DSM=#3;ci|1p2O@XNxRg|`du6y7VmUwE1SfIq|^=6g!L;yeL| z7t2fFVR^y4RlG0(K|mBl2qFcGe2M@N0g~;!9Xu_sh?l}!$4eD31nGhd!6rebfF;Ng zutlI`kavx@lh?#+<{1TML91Y^z$S1A+5}DkBtS%nWQ2E}cbeDBJHtCG=o6e1To7Cm zTozmr^b4*E21EmrQQjEuDQ|)|DR?1xDR?EC5xo)3i55hQq9u`6`6L1~Ayb4&l0 zheApjPzIKv7?|9bXqzio!v6OC8|VOR^_YivKl$3yr7&{o>Z1nw!Vx} zmR^=oR$0YQ+tDdq!`HAw6%ik;CRn}g%r)*!@fwDs-m&+cM4V4X-dCPzblmcDx zxO}|)S=r69TP1f&?v}hMn=6YHlf)D;TMSmzDAW}N6}*aKaf*0dX_`1)oFT3h%f(7@ zl^CgTD+U!ODn70_Rk2IlE;g3#6K^fGl^zx!5qF8Z#RC=IYLslW;<0#K{H6G2>Fv@x z;=85yOTQQYARZDAi#-(pm?z;#VkHS8tSDHtN)jd_NQjaMNtA>np-2E32yU0`kZ46k zq7>0ONven;kxD8gl@f)7CCQP1G6WnHT@&pTHHn%fMv+<4D%mQrNgR?kiBkee5Sbes z5nUIZ7WGQbh|Ws-B`B!3A&;d5B)&$qAstKzJ zuZgIMQjt~EN}v*ydZc+Z9MxtOPsLZ2s6;BUs$3;gDO4&|b!CsQ0`g-uCsgmM-c#*X zwX623_Nxx4I#ivi{>q0^N;yyt%2BnWs>iBv)ic$k>V@j1>a}WCHD4K3t}L(eRku8^ zmQz(wl~9!=Pm!;ar^(ah8S={V&hjpKx37BS$7)Yhy<7EO)h>Cve2;ve{6qO6`DOWo z@*(-K+$#qZC^fqJan*R$Gx<&V3;9d=EBPDwoIFxNQcx6Z1*oV|bE*rf6RMLGDT?)q zG)1~1Ls6-aE0l^V1)^|QA5)*G{RpOv#a_ieg+*ag99A4rbSb(O0}5|FN;6vh zxO%+$OT|saZN(kMUB#t}%N0K;h7`jJK*QGMfgCUvOi*HF!Ln7#Fd0D^E{l*wDM?C- zlC1%C+m$<%T4j+eMYc|sDq|?6$_izrQlVritCWZa(G4oEDR;`6WX&?8%&crxZdKZp z4&^qbQwb^E8nN{>UQ%9G{#Dtpys8|~4CqE>W3s2R3E8Cb zh4Q8Hm2yTorn?a4XE;{@)|e|1r5B0;s#-ZsG+Pu+8}FCG^pyT>v~k4 z8ldV}!;Xe`>)xx|Ro7m(w{BnEfx3>m&bt1(hbl@HPz6?vG>kSpt{bm=RySGqyzXV) ztGYLJ^L0_R%Bm_~bywvzavEc`30i)wu(q_etX5K6URzn)S=&|B?W>;JV~r;o-_^dS z-Cg@>?VoG^QhUDkV(sPH2USB=!?oU8Kt0kp+W1&IuAQj;rS?Vb%i7nqZ))diBdbYj zikhtk)p<>vrh@u}`egN5^?J2fEm4=NE7fwfQeCA+)Nb{$rV~x?*1uQZr2d0?uX?}w zfclX7u=;=z&XTd)3oaTb&lIDu8 zU-w_St2&R~V;Tj=z^C8@I0?Q0Uus@yW;AoU1^uG_t$tbW)q722%74}8;FM-s^I9{j zpVu#%-kO$7%OVXbv*3GKZQ8W}-RLOg2-^Kr`6jsmn8S%mwB`bFo=y z7MaV;Qgek_ZdRGAn|pi}&>l1IFrREb)%;2GndY<2e`!A7e5v_zbAR*028tHYf?8C| zsQF2AKqIy>sBvXuXd}Kcym577RHL%7%2(amyq1`j&4!}JcI_VR2ikqw548ui9okN9 zm$utiJ=$X}J6e8kc)#(c_Llax_KxbB}^y2JV|(@|58X~5#KkLa)K zPV0JgXLM(EeY$hH3%X1CE2bgSL(?OZ$Ja-7W4foh3Eiabh3=*9m2O5qXIe15wJced zEnbV)KBjr9`DcBuo6=3|Uh8K~^QJ}1l6~1XuWu*^+TrJT#}ViVa;$QMI`9snBf>#) zP#wTl(Clf*b8s954xXdfA#{{F${Z3$g`?7;bW}Tf%${bzaLjSS@rC(@`785H^DXlo z^Ih||=I_i8%n!{J17H9fM;xP$-?i`!0z;`mWGFL84CMxyL2ghQstlmPZOCimv=z4O zHnbb|7(OuUGaN7+G;|m`4PAzAU-cNax9w=#+47a)rs0<1Yr{8&yM}KK-x(elh77|7 zuK_TQw2iinwP1}w#+AkpW0;X(BpO#6BaI{@#mF{-#x>hww#B#djY4Coaf?xGlo~6H zGNat6G*%fAquaQB+m3DZt-Fow#y!RljQfoTjE9Vejh)6WW4Cd@=xrU`c5T}qTYHT+ zjkkp@nZsF_oH9O$<}Islrrgaavp!*y6SiI0v2AoI5Q|re>4TWHz;$wwi3F!}FL9Ugq zP#4}sbVazLTof1J0v#T6jq6>?IvkyjE=P~UvlVDL=DO|( zuwtz^>q_e?Yp4}(4Y#hgMp{W$iWRVeEh8?!wjwLvDzuhbMb;xxwaN-w z-7R@gLEHP*-PU&N9_t6zebx`H2dy2}PHUI7+v>J@TDC*)w%xFPWxZ*=W&PUvjrE@O zzV$on1M84=*y^ z?Ai7lJLp85HAsOo(VlEiv9GhI+8K7Ky~5sRcRF28*y(l-IFBLkIveaw_GY`$Znn4D zx7uy?PJ5U0s`GD7k56d?x$Zn|@3o(?pSAbd&)F~7FWIlyhn&N|RxdJYAG1HTPuM5z zFYGVvuk17SIs1b1?LYN@6&|xZwMcK5zUcg4e~zobRp=^m30y)~ zsjJK-ah1DdF1btTs&auYkK=^v3)cgjm;tB58So}J6K26VFdGK9#lVGd5zL2$un2B}E$~*@ z20P$3*a<^00=u`V;hpgN@NT#r-V5)8&%+ntOYmj*uW&zn6&`@S+fKlLgipg?!8hUC z@E!Or{4E@TL?R@Fj8G5&VLM0R-yu)o33w7-g@ht_Bplg$1IP}f9%(?DkY>b$v>+D5iX29cApeCt^3CHDyoUS{ zIgRupXOKT5e?iV87m>@z56DAb{g>}3GKM@wCXh+w1@aPkh0Gvx$O7^fS^lm2PKR^C zIq7`voN`V(Upr@=^Ug(N>9^`dzHt5B^`+1E=70F!cYW{r!S(Q0;W1YL6bRvd^$mf- ze)Elhq98Iv^$ExSsw;p>e)SbYlHYt4kP52y3D-jnP?Jyh571s{pU?NezkQEFJwD-` z&}pa_Is@H;ZbNsVyU;!8KJ*>*0Qv!X2t9&4KK-ZA1T+b)ghSv^7!MO*A{+rn!X%gs zQ(*x9r+zY=0n;U3rx z*Z-!!2kwK_*y=J;(>hIphNJ8FB>~`j7qvas&Aaxry9DzDB-5?jheH Z50L-#{h!nE9GOCy8JIW{8hwj7hiStSDVfuu6QM^`rt@WaLL0+&A2*9aIAGJ@NkJd-$WALf>+2$qj zl6uL#s=X9mz{ec`(N6h%>~q@Zj8D5yhfk-^U%f7QUGci+^?_Hb*MJWmpr8%;4EsFs z8SxqQ8S@$U30+26wtCr1uO%_P1qUFT1v^cUkMQR$q4@PCMoMvF~Z$GrsM<9lo8u z+q^m6tG(BHFD=8D;l6kv6w&7WvG;#@w|jr$-Q|7O`-1mT?@Roa}JEE4LBGeJyCKw3yga(3@U?(^UEf`SN>AZU>AE#V1agz%IwPM9D}5oQU`2`>ms1f1X|0+Iq6BL0K; zzr^o|W5jXd1aXQuL!2Yd6JHXSh&a(rYK4YL|4aIg^px~H=?Bs?(j;kyG)I~zy&x@; zUXgH;8ybPWgPua)L*vi{Gzm>XGteCL99n>0LW|HV2#2Bqq66pwjDWa+gaBqhXaFT( z_42jLY0IJIa1aQ`Bb5Q_fVu!}fG)rgAX;9&T(VrcJkuxJ2Mg#U<5ZY_D&XUQ(*b7! z+52>=tBX+0Z#%(0!9PI0)khNS5Q{0Uh&fB8=qGJ z5ut$AN{r&iow z@wXLMR$TM_(D%c@zR&?0PCpfxlQJmG7&-SD{b@9NXsi zj^8f7U-|9vd*5%r-yuJTUz4Bwt(v#8S7wJPA{4QMe&6~%@%zqi%0#zd`zM(*KY?C*2|4CEX+4C;g4|HR%!Q8`6gq00G7j=_chCJW${os=l&>iF zDGw+QDgBg3ly4|*sFg8H8G%NjvDd!O-uTW#FW%@5Fh-(B8Dos^89y+dF(w()j2Xrp zW1g|Vc*$5~ykg*tC~`EJPG*qf$O&X7IW(L?UQJ$0rja2s91bG!^-8juTu0WDbz}os z6kbl2kfr3zpzI(lypM{*3ymk!ebbBH`l zenK80kCI8Dt3qeUb3qG1FN3I|Su~Um=&j7C(CAQlC?hm3v^mrq+8A1~O1etEswxzr zeL!!e4=|OX>d+^lqoLo2PK16HdO!5ysw=BbtU4LmLwiie={WOLXigYCY<*ZlSW;MW zSXx+E@ao`~s}@5SX|z}<7EWqg^G?{VuwRAk341?mf7qcgd$2TE9$Xcc6;U0lh*cyF zhJ73MS@5mkKLy_jz8n0P;0M81g0BUi3_~J5h;5B+O^T$fqr`+TLgGW1Asa$cL)amk zLe_>n3hRk@96Jy@kW@=ihG;^xA^MQ|5L1XH#1`TVafM`2s1S{T$KpwCA=g88QGP}F zHDxcQnR0+~h;o#2oN|&<1#uY)2Fw}^xk1?ty$kJu_Cn3je&`T%1Ud$_Kqn!T0T>F_ z(At}8+Zi2 zX^{{Wjs)xR4N9t-T1VAVbyNdY6jL54iIhfWQnRU8WM2%P2q&MSeoQ@0Jwt7$cExl@ zo{v02Jx)DA?TK8B;WA++NFSmOQ=d>rr~y%=s7dNHb&fhuU7%*r5hlt6Om}(|Et*EB z{VM9cC{vV~CZ<);HqxZDo%EB;UZ$HlkglYuX-}fQiyDiXi290lj&_lDjCO@~mHvqN zn29qX_9G5f36RM;wo6i9MP0K~if{D?2iJ zU33gYg#4gDhy(>gp-?!q5YZp|DCu$1K+*ua7E(eQhylezOo#=gKxq&M+61j(P+2q< z#KPHa(Dk*uq6-)TMlnOkC}Wf}Dj1av8Ka8DWx*_%GYH*)b~E;{_OhB;`&b89hge5g z$5<__lPr`4Sb#GWeKWe9)xqjyb+JBWon@V8U1VKmU1jyKdRcB(D`%K7!Ww1$C_M2K z-xnU=C6Dd^$5T_sQpY(HoM)UV&NOG1Gsl_dEO1_O7CEmtI43G5I))y@h>43yh+)Qr zZlENtPF$NvTMw;=6Tt>NO&Oz(sf*FZ=wb{pq7CJVl0<1@=KAdQSYlryo(69^74vb- z>6kMy?J->&x)aYQ9$9~U{fYHG>lYKb>2NyOG!!!&^CV_@azHYPIhi=Ues2Bz`i1ow zOe7sm2kCBZ6g`?wr~fM1$SjE~i%X@m>5@1nvn9DFy*J&Rj&qfCHT_BQcg#P?Wiv0ujCi+vD#G~Sui zl5&#$0lSs$&W>cQONdDzGM>hd$4|sh#m~e)kAIldpYn+Pm_5KA$gWLLCTJ2E3I41= z7KycrMP`Mu!dYulsT>-|vkGuq!ga>3gaTGkYDsEoswlNQwIa1LRhC-Csph~O7#>Wx zk+7S!Cv`8UnX`{`fOCj*gmaA3!a2!7Ie-J;p@f^P_S6neC#Q?k%{j|C&$-CC%(=?x z;q-FcoK|?4HInKP=KLr;>G7R;?fb%`yX4UwfJZo^oUzRD%n5iBo`PrKS@=0T4==zk z;YIirjKfih(TVg#Mq*rILLxIUG>fuv^~SYnv@|FUP6He9EM=lPu`W@Ys7o{?in7W# zN;XQt9#@5jYrasr=3XaNn1?ga$zpmGL$%+ zNarr+`g2L#$&J%#b7}Kw3uzhY2p8o7u6s)qGn%=J`!=_5Q^}^X^we~AvLxM^-mTDFdDOfjWcQ?{kB*_9cxjH+xj8|1X+4Q70s z@frIT`*zAFDP1XNQ!b<&VIRwA$vBz)L3V47J1;VG9VdoEOnsVihy5k{EB1Z%1NOs= z{)|W2kFy7I@Vr`%lA}pwaQrzdGlMdNGs&4@nc`GunJLSxf~#Q#59SZ1-bmfe*^{|9vl-qGAA}FVN8n>{3w#nrVZa0Yq12n4 z_RNmVPPhy1hR?wl;EV8O_$u53_rh*oD}R_Xk~s>G!Q=2V-Xw3DH_Myj>OH7I{lN zoHxK9fnQhN1aFc*&7a}V@}KkP`7ih{`Ahs)e4HPZ7M(^Y;fH+2h}E8#l1En9lF^ya#A@d9P~w*@zIZ{_|j_q{FqwjAUh z=3eAJ+|s{gF?T5!%7aTzrRNmV^B8&Yc>y_hH{IJb!wt&`&smd`mB-Cf6oQhr!gum^ z*Z;Su4d*>|$<=G@Dc7de8ncGs( zQ_x%BF2>6SxBao~X4#qI_Tu-7n~M(?A1=6<`>>$DV6k|q7%G89n=96d=ptgtijwb( zzbLp@Fq0cr7+$!hFsp=Hq9_3sZ58i`c8Rnlx)NhaNnuLfw!(_S%0gKoQi7JWirf{0 zqHjw+E4fv2yYQ33=Df3o7YdIQ9xH4qJXz9P;uZ~5L<-jlV+2IO)51G>cMI(WdN?0vah!v7S!43Xy{vN?zL9<}L;GpoZ@QCo3utj)MhzeW9t&$=B zO@6zeL(nPc5_SvE2`>mQ2`>w;3VVdTLbup08Rm}&Mg?Pnaltd;lyF8oD}F9s5Wf&F zikHN=ctG-|3MYh<;%V`$X((fD}POWThMtVm2uJpZa&D#!aJG|{; z*~7B_vcWNHd7WR3Ky*rWr?^IiV7h6S4i=NeVd8M{ z8ZlKulfZJIZIfJ=>=GA zR9M=k`AG9i&2G)FHG4JtGzTsHeK6wRNhxt#y25VRccpuv%1IUM;D1N?W8o(q2!+tN&2Ya+LMZ}-_gqI_CCE)9|e%gC}YS-5PCEKA0fDQZB? z&$g?!Yqs-Mg*8lBsZ1m*msQ9rWilBeLu*=V+^WItf874r_A{zq*X)(;lO2#9sySM7 zOx7ansp+j5sDTZU+I89(Em8fn=8o*H?4E3<=5MlxvVPfO%~B1l1*TfHQms)l6#nv+ z@*sJzoGcHMhs)Qxy0S0(p_VL|!Tv$;;&x@=Cc(UZtp30Bx&jP;o=P zTe3&KSKch&FFzQ2 z&v+TVjlM>r(a#uY3^E2ALyh6awMLo|dK<0^7GSN)LjAI1^QQ_Z+$ zLNleA(LC2IXfl+D67^KKvbKIp{nmPZok3ZzG%3wWtJ1D?DqEC2%3e>!m2LH>>VH#z zrmjQzh4QZQp7Or(f%2iUU%9AUQbHkj_*1XYQuR3%cCt148LDwzsVp{myH?(Kiraec>ccI@81NA zkm`u)n5sq9qw3v0upKsenW9WSrjhNRtG-a(RozqFS3OWYRQ0PCRZH7pgU8>bG-*r> zt-pGuI!GO?Cac5LtJQ1NS=t&;bvxP&*A2V01?nPoiMmuRQkSbM)Rk(Px=M=~T0MPG zdqcZhy+^%Q-K^fPKBzvdKB_*hZPA|8_8Hu!0mqQ~rn+6-q3%?7sk_zZ)ECs3wEc#^ z8y*|JF${S6uwq0#su)v`tDmW-)HCWi?SkPazK#)vrz*x36Y5Fzw02gz;L%@lEID3z z2KS6tqj#fEBeBu1F|d);7~B}zNNHTtNNa=|VIz1O*KBT#a>h7gopH`YC(D`QOm}je z8P04c*3kDh{x)3K*7$Sh>4x7n{I21XhOUOQ4d)v!He6}wX;^%ltAll*&dWCB^fkxn z5_C)*OP8!m)3J3Mbs0KDhw6aNUANh`r772})4ivAU$;+pKzB%YM0ZTrqU+K1>fAcK zuFZC;>9o0B_h;P~y1Tl2y8F5Zx`(=c-J)(u2kBwGmwl+|iFs5PpkJvE(g*9w`Y?UC zevLj$&($mRK)>0(WoND>PG6)i(U7rX#7y=9{4MB!r1KAK}2sf-TWEpBa)#LBD?%HK7FccX|45bE)(8Mqs%trGLbA#DpZZzA?PV-JP zVn#jHUB4MsH)+is=1%kP&7Ydjn$MdrnlGELntRN>X15uyZ$m$BI%6I)kDDjV&&*Ti z8S|WZ-u%M6XkIcy7I?=XO4vDK_O}FDSe9f`<)mG-?_%jhmjCrmQp8 zIqQP;rDN&!*&ol37(CT5ZkjMnnx;*&|50%eg+wE<$a*9mNkmvkGLnk0k&Q?O!bM;N zIPr#`Bd4AJ<@~L)!`bQVa&|koPAE*37fAYPn>bK1Y4pl$+p3kVoS5J zZ5wTyY?(H$4YmREGL+t=vl(plwjH(xo5j{>v)i1uCY#HK+JMb%R-$!H?Y0hEr>)D@ zZ98i_Z@Xx_Y`bc^X6v=NZMgXqdb(-UHf9^QP1q)F)3zDgoNeCr!uHa(WP|LmeF%Nh zw8HLhXWCizWP7ST-Ojdev}f2e?OeOU4(wYn`pyEoz+P-O+0AyV-DbDjo%Wq}mmRgY z+THe_W4m^~Yu{tvYwxmm+t1lA*e}^H+ppSt?7j8@JM6lS-Q0QG{<-~*{Y(2-_G$a9 z{keU?{=&X!U-DGoS_XVwD;)lgKnKaO$`Rs7cW@jsm)uqDs_|5}O9^sa1rC9u*dcV3 zImC`_4vAx@>!j-g*N2{pgHvFa>s`kl$6iOXW545|KJp3JDxeF95aqN$Aasn>nHx!QR|p>+&W>Mv`#x_ z9Se@1Rvf62Iz)@;5Cc+=m=H5!MQn%zX+m5GiU0(6-atl>QDhAH9{B-zhD;$d$Q&|{ zEFdqDB?L#{CIZSp< zb)rqE3q?_Yx|@E1oWaU16GeU zU>58Ub{IQ~9m86%lh_AXE9Tz$3v4&`F4lqV#XiN(V&}03*x#_Pv3~3k_81$$U~mJw zh26$J$L?Tvu_TXTf=J5qu5){*yioM!+Z-1LNQsm;y6k4lIC|VCmoIJ=@_LbB((uT$8S8*R0F4 z9Y3j_`vLh5dFt^UM<(9*&LYn}!Y`1;*TO`PZoEgA>G4hex9=v8Zx)*E5$3`V5^yr_ot-4xL9A z(3j{U`U=H8`YSMhED&R1$yf@OhNWX1Y$LV_%fzyuV`pwvW>>PFhyNF%Ju3%TO9;_GZ!`yH5JFzaT8~Y13>(Slh(f!ev z`&#&4`V-hBHjRb8*8P9J0E}S&)F**eAQhy0bX^|ZfBCur1H^#@zyvH%2E|3J(8=KK^<;_IS3V8FYhl;KG0CQny4k}iAG`*vCT*BqwuNq zfqZbHi|nTGV!DYR5f2a#5LOepe?sL=Ul+PI-mye6+Ap>D}%st`&agg|c_z&Vk z;v-__lC?{yOK3}gC4e6<2nut?#P~7%;{6i*68)HdDSmsF>|0`Af-HfSKz?|TGt3>+ z;HUCa`)U33en!70znLXZmfT*_x5Tx?<>v}=hk0VU{XX(L;CImPW4}-Qj`+3t%6+qa zX}*9juoPGhg!5w0`ToK8JKrCCfAsD3z2bY__Z#0%U&I&pg_c6gp>RCbhd>}KB`hP5 z3BiOALKq>EFz?&v>-KdmbuM>?J7e<*d_obSm{3X(6DkPR1UW%LSVsT|fWLdWJKP<+ zh43rFuL*Auwh`VYyi3?k*h}anbP;d@)<_HS} z55eh=2SX7&#y$T5|NH(!{tx{h`H%Te`cL~m@t^m9=I`-$1>+GAV<31i_(AYLf=7Z! zgU5m=gQtRLgXe;u1}_GCf?W|##$d#Qh<`*pjCd6BIASbfB4R3HCgMrNe8fV;VuUBc z%@|?~GafP?F-93a4O&fq9dSxg(nhn3slpaVA0jRuKDCykt^MQX1{2}mS z;9mkS2VM{SCa^OQT?z(*ArKXh#glwUz9c`=G7^atObQ`|ks?X+fj=!h8|VmeQeCmG zq&!jqsgP7m5|PSD6{ISXjHDpd`O`^@A#SQW)}6G4)b0O2{)hYz`+w&Dh5uLnC;U(O zf9sEtazlYAfB`V?lFpOi<*dr@7*Qlm?25qNZpmdWw-EiIh_06a^(`1xRs3 zx>o^-P--{jBgz5FLCVLJ-pDU0$0_?(bgno}>5Ghx0TZD_XX-u50A-N!fbtK@nw9LZ zu&^g9=2twW&{pQeV2RE|S87ZcBP>2FAuKWMot3-7TEpb8C|*&9AuG|Cvx%-mPijM$ zDr_lr88wKyf;t&?E$rqir(QW7c4p;IF^h?wL?Ep@tdXh?*N1NkH-%fntHalZP(z}^ zY1HW0+$3HSly;7KKKwxVq3}<_kA@!$KOVj>#2x~N*HY_Zu_QbRPxFcLjUa{wgpxv+ zhrSX@35^V$54jWGMg1Vwk>pBprR7BwM63@Lgo;ATLn}h7LS>QAx#N$weXp68#z!B@Bq8W51zy#QLBhH6zjrwiWwy5n6kLQEd}Uc`l{LyW_WPZ^&vK4%h@eSiN<6DM<>15*U0pLE+!@S7+ zk@*+qUzt~!*O=FtH<`DYeawEQi|J$!GKQGXg-2fq|I>G#x$r{Q%^qS6vq#vY?8oeJ z_5^#1JS8Oa#n$>9C7Z~fK(`>oAwdy0PP^{V_I+AmvP5e?OWAJJH4te zE;4DUMWUsyiztnh_lz{c-$}_;+F~ zF|E<$Z@PIx{e?%XrPtj-Tx9F#0-+%SY>a%ICG*@;Wqkyp@AFLKn)Z#M2vFA28M)D&5$z`jHm<}i_Z2Q=iX(U z2evZw37Zm{6Iv2137Zqz5^M=@LM;nqLu?-R9^(SzP{KCWcGeEoyR2QT_gH&b`&pf= zE|!DsWaHd{g!>6Stc&bR?7y)8%D%$B#=gP6$-d3*WB0RNY$tb+ImG^1c+BfN`HSzu z3tczYTR9_~QSKOboIA;#;!bmCxlg$B+^5`U+(oX38xzNfi;qi)ON?X2rNo7&N3Nl+ zp(O*!ykvZhD;>ych*QO>|O(8K{?%VAH^MrI~ezI zTyOf9YmO)HOYTfQ{aRmgbSjtuWjS;1#SO#_#wBK?WUNRHNtsTbeQoYFY6>?M$#7&j zv)uVH@r?NR_>VK1QcNk8iB*Zx#EukO%BhSq8U0!AETEtvUKPJIEg_(~4IMlgg7SlhTvIlOk8IT%Db{E;Bb9%Ek-MrJYYZ zu=?QYHWil2}2k6|4|e7%P%>YxV8Sh0MilPqwFE3#*%{W)`!UtktYF ztTa|Si^IxdQ8_dYoeOXQ{$1vI=2n)TRmKr>DmW5OHAlv&;V3w@9FPlfA^tt)1=bywSil04};`8vhg zoV8%OW378FkOLKVCx4XuUEU9Q7xQ}azFc>F-M+P*Yfq>5rAKFhIZ%$X@Luvj@~im) z`Q-c+`5`&eYiHBv(y3Y8EF{N~uw|XfIg`_$ z@6HE=4JoRWr3C>64|9%Y9Lw09dOYJq#$3*P&O#2ofL8tye^)D?-byo0nU9+5AP!H z62F&!nSX_UjemoGi+`Kn$M5I61TN7acZfI4^9u9F1rvfP!L(pjFejK7EC?0_9)Vlr zt^5)Gs9;PqA(|3Ri)KVmM028f(SqoiXi?-5#iTRRGiYg=kloe+AHDqssT1ROz@fGVJg zaz$Qp$zA?={#L%8UnUR>Dg+WiwLm7Q5hw(;B2Wa0amhXY1^yxaHoZR`|$#Wkkt?%AWEg!lS}t z!sEgd!jt8v%gyjIi zTaw$7K1sjCEpsUcMML6Y@rZa-JT94(Ov`3uPh@klr?LgvqRb<6D_>U0m}EjWrJPYd zQO+snl~0um%4f<&rAO&g?_0mLepx-aKDa)lKCC{no?1_<1?0Rce1mHPP+ebNP+wSI zTra9Gudk@Du9w#4dw*rd04S#F6&~UKsaLtkG&#RABAFn=9Jy$(ny--b;@}!U=ud$#pt}y`& zR0K&MS5H(=S97FU(rjt16ja~}C-}R@4;x=^{0(SOlu5>^ZEy`}CT3IY(N?5W~8C#YiFxnKFdvPB0HDJPUu(2Q!{_|&-IooB{HqsKcwI$xciE(rgz z*jF1}1J*!w&N?5xum1142OEbsKH508adP9##<`8u25t>f=kQi{-4=bLexqKXHa0Xh zv@}>6S{phVY;~vV&eZjLD*)crpVwc|A5?$RaHQ_@x?^?6>rT|o)y>x})X_m62sN%U z#2VrZ{u)wa5SR+G!3>ZCW`WsYEeL`*=xqF*;a7&&4O)$;u?#eWm0&d}18pD-c7YDi z)#%pv82@JYyWvloPa2PaUx3HJ-QZsEBzPL^1N$32jgTqNSYTXlOwf{4kHB$o0-OSG zD(1kaAWcPAK}M%_i?-XSRuw}`B@0T0*iZ(JZXa}?t+70c2_Nn%(-dA<094eR5Z5>eFSN13` zDlb93&}HZDRuI0ZrAJ}wo)8S1=HhsS7%S~Tz`exJVO?|rP z2GCob4L;^2t$s}bdXhd!zd|3P57S5Jsd}y&Q9HcV-B54NZ!K)n>5b|pb&J}f-mGp@ z+tjDjXBzq&+-g8`&iucv2b#Xu|5^Q5J+7WqPpfCubLx5Zf|{=3X&}uiOH7+zbAW-Q zVQEq|Y)yuSqsh`_Yic#12G=+>TP*+8rf$|5L>iOEtg&iZHSHRk2G(?G92%F#ZMbW> z*Y?NeLxyddqna-?UuuqPPH0YQPHXx!{Thz}vgTRy+v80E#)q26nsLpfW?D0=nbSPg z(6n?TWb*o3yW7>KVk1+_(xz(J+6*m6yHdr~=4df*b;EZ}=S^F+dR3W9tg291wXNEA ztxXGSQLV$|^7ebi3)(}fZL0069jcwG-P%3cecF@S)7o#fXH9Oa2Odz}SM{hasxGN| zRhP9_wb!*bjdx6ark_mxFZv)fq#9O@s76)e+DYxScGmb@_!nPz2>Q8>sV1~j+L;%1 z5nhBnFUJS*Mf{KeBoGNgRv@8BI1-6OAppYLjBj%30Chc5(6PQl&>`$7>)6my*-_mg z?@)Gt9gY^a4$wpD-yt7%eAn`Q%b#0*Z0T*e+;X+$M$4_1zLw}FP!H*ydLPu+_NqCt ziP^NeX-!jFQ+iWo)7mC(6QXx`t6N`>7T7fA-!>i5AJu=M|5ATk|F!-b{VDw!eZRK? zhI8nLw%?n7XnLf7tRL4;>ZkQH`X~B%{eqru;29vpD$Liu)UvEO#lSM88rX&m1IMt| zkZq_nfCjwT*<6n`+BKGv<|c#5U^ZBrTbtXPZOw3Vm%(9hHM^V7Vdw3?xBRyGh~cQ= z3&WSq$D2}iIqt8icVzU7DJM~26Sal>Tubn|TUT=Uarnu%_Ltj_i= zcq3e7O*Ew#S;kZ&+mvDAn6gYAtbYc+q&t*lWCOylT8|x@o#& z{i(g*J6=P4&^TlqHjWrajpN2iTFv&n2W zTg|QJHgkvBZbr-wv(xNuYCt#I-e~>Ae8haz{Dt{T^KtVD^Ec*G<}>Dgv)c?bccT|< z-?u(AKQccykDDjW)8<+86Z5=z!A!UCERbahMzjaCF)b+;mZj1nu~b`R7P&=XskML> z+~Tw}VC(J0ZAMFz#bmKqc3a-F?6vH-bXvMB4vWj;wsd3vV}GOV6U!0HQOhyQSC;FR z8hbK7&;F>iI_-T3RUu3cm;vx=>i)+%e8wZm#_?`r>`{j9fo{qYO% zq4sUo?baREoz~sfJ=T5JlkI2P`{C!?;lT&m?^}DU7p<49z1GXttJdq*o7Ow+KmB}z zy?xL$WF5ASSVyhn)=BHMb=ErHzVN)h^!09sX~Z;Y8Z%9prmQnR*O%@285N>Nw1^%t zB27pOVnH?|ZAb?KBPfC+t`5Nb5%L}KC*%j@BJv~Bi(E#oBG-|d$Zez#aU*~YY8^n9 zqC%U)E8 zusLn+*8fJgqK9o4ZI^7lw!hl0*sj@b*lyZx+xl$%Hn$CE`vdwNI&2%UEw`_*huA~y zVfF}nq@8M~+39wk9cm+BOR*$-vc25C!Cq;vvRB(>_8PmwUTX*KxZT;N!iq41eUrV} z-eTWr-)-Mx-)rA*@3eQ>9d?)9-S*$uR_w6-Q~PK3&+V7(SMAsBH|@9VckF%ke!IsG z!2{TLSdV?gK58GcPuQpI;cz5Og`;2^Oot)Z2{Z7ecpyxMm&0q|G&mj3gyk>{BQOeM z-s;9xxc5g0xD+mjH^7x}72F1Q!0*G~!e_nX_J00MGL+=?UH;OS;`NO{SNSGeCR{JmFq1YM4; zz(TN4jDm$@5m+Qf#iB48M#lgwz^j{#t;RNBm6!yp#-x}GtHBhQ605^N4D#v=z52~q z3$_#6jqSnqV*9ZD*!x%)_5tR=oG^6Gz%9mB3-*Rh+}E$lXS2kXOr!um1yFZ#XM zWo!xyf1&#?UkLyHrT!Qef>ZF!7rOuQb-vVJj<3Pf@N``2)$RI4_qp(E-anb1>uzW;GFP?dm+VNb#l5{Rr314M}CC=n<`h!7w`fCGdiK+FO$>sh}3yi=V{ z_f9v)YDPPb+N!ngOC>taZR;@BtuB-$mWmW9f`}{v$vsl1Gjs3!9`8S2kNoxgeDg>m zy;VkiuW-tGN~_g?RP-Uqxt^FHK#*Xw()POnxkraz=K8Jihnrok1 zF;_Sjo(uazOW<%M#*0Fs%%k{H7E%Hzfs|0n_jA9TyK63(3w*&65DsG2P(+k$N-iaz zvVkI{$SCC$2E{$sGuP?sSmFqG#%!Vd7iAmeRm$s>wXb9$)vseROb>d(|i)W_5()G_J=b&5Je^-!HO2OV(k(;m=%qCKPy(jL(s z)1J_t(#C0%v?-dK=Ak+14$cGmPxOcM0s15Q5dAUz3H>R3oIXK+MxUm;=^na^)6W^; z{LFd88R9(VjBrLdPdVe93C=Ul6laFx=6E=fek{LeKaO9lU%X$UU#MTWAHy%g5As76 zJ3?Jc;lvt0g`d(-?bqO^@hh1xn_o7+V!qIu@N))w7;rR5-0k;?-(J6ceh2(M^Sd?w z)ciB^zns6zyVcJV2r)slGw}z%AN_j$`uzI+2K-VN@E3$FU@UNZNBF}*2-6wuN{sYp z`A7S6{A2y&{ZA}7wV-7IwxG&~@OK0`nXYJ0VvWDTU+J&*Z}8Xnr}~EYPA-^U(CyRe z?+S7;p%^%6xBnjBKl^^_d&u_--xIzT-!k6{U*Su_g-|dQ0mmRoUWFM1ni@+@pf0EKsA<%6Due2Nse7R_*b(83aVBk{ zZl%6L{Vnx%>RZ%zsqa%;s2@{_c@c{|!LA5Tj3?;=_2Rt$p7+hXwt3&qyD{&(d3Wb^ z%$>R#jsK_G+!b9-pLA$=kJ zAwP#a3V9szB;;wxM98y{nGjEi19ETx_ddN3>W2oPL1+ki3_XFKLgUaRGzHB-9>~RU za38Rq3lEaQ!?V6)r0*o@J3XuG;`YZ6a0j`MxWnAX+$Y>o?o;kKcY^zjJH?&hy15>1 zWFRXrI*=0>8yFv$7#PY34`qZ#ghHVR!?D!03{I{IR0Jvm)qxFxn!u7!S!h{cMW8T{ z2z4?%Y&a35?hgDUaBtwgzypETLyrfZ3T#=tV{vEbG=mvQB!Wa|>JNcG2KEN_1@;Ff zhouCC1WhiUTFeMr#jK3nmFP_Lq(%m@f}(>sL9sz!gdGpE1la=604(fd=FZ6OL{}n| zRuiNMiV2SkPYh2E4-6g;nhfX&=nU&*c11=cK}m4h?w~#4uLQpu{6_HG!S4lIg3Fc& zmaGbAL@=X-Nk|e%^P=|z_XhtI{B!V7@RQ*2;4@2hEWyID2t0~N0!favHT0+uHf?j=_?Hnoqgs=kNv^al^sOOvw0fF`rlU2}Of)MErLCe*M|4HGlRQbD zvfrv%UlU?dJRLt zP%_kv28M=FvP{MRkN;<3~m>qmPjk9S}*29Aiu{!Xh)G<*_@HTT`8>p4E{|7BiZ8Ir`h^FCvYR zX68nwEz%ynBepBKJJpj43u~APW=zbosKlt`s3(zQ%)89?$nT>&Vwo!<(x5a%xSP2r z=9QTGs7+CZC}UJ<#L9^DsPGti-0BroX-FCndd2s|^hSLh(H3zv;zq>nh>s#{QT7-# z4qri}IntcMHJm6G8=41Ep@mQY6aFpRy2RSf zX^h_#uZwSrH^!UdE%CN^G#=+w@ew`(_i%bS`{NJt4)c!ij`EK4PVi3g&hXCh&hvKh z9ee=akME0b<6Yrj!T^CGN z!5};YKZZx(C-75v3?7Fk;b-s^JOjI74;;y6v7^}>b}T!doyZPd8J@ye9Nvtf^n%I)uk=~W=UJYd;c{S0B=$N!+Y1E{}Nl#)=#NLU$o7kRA&tPUm z2;oeSw>x@I+AC@GNsV#(IAdID96v5JDQty2qcWpPh-5nQy!bt7y-8mueHwQ-?r7YJ zxDVs3NwyVe#?FjgLPw@EZw)_+$L7w9e;D^D?s42`+<4sSq%$kdWt`7w6}mEAd0Ti} zxpmxSTq<`VcQKd74d#Y&Cs#~m%w)KQo=ix5fqOB28#kAmz)RvK^LV^e9-o)a69`rd zgfJ|E#rL?ExZ8P+Je|NGXclZ1m;@GqO@In;K^2UM5OEK;m$#pHP;gjqL~vAaTyR2g zN^nMSPHZM6 zLUaNrAvPgCAu%CzUHBTts)$w4DrBW&rE3+ORg<7dP$sAo8WJ=KCF^8s%GOk@60Rgx zI#+sD!D~U*?u1VgzFK#A-IaCM*BxJTYE{ds9Vl>DKg?^p3S%Yu#B; zHd0WNs7Q>-UY1SGJd%1W^?2&Z)Vt}EtLd4{Okp;X=P25pxF`FS%z9y?P@85d3tQj^Tnz=J`SGF_HRkTJF1+(FK zf`=Jb(ypc5OuLQXA_s_pv`5e@*e^IJIxIROIx0FYIw?9OIwLwKIxpIl;}AQf_XT}|HqjN)RnhgF zn>pX*+|Id^)1K3j)0xwq;}Sci58!^$fM`%OJS+TEJT~h)MfyJ1bxFyZGng|Z9+8Yn zpGwE1pWxy`MXp8QoMJ=fenW?9NBPu!>RQxFYkD{ zbKUehW)_hPa-I1p<&V8Qu`VntBTJsOGq;tjp8UwvJtcb!f196| zFUgnYm*mQ_tZQ4cI&!;m-MLT!QdE-~Rq9hTzu;m1q5Na{$FokZy}NcYi=M~K6BZx^ zj?&$!drDs^sxN3P&=!oW9$g)rxiULFTb@^$M-(`UT;*QUo`T+juk$|5ek1!W;d?@J zrZwA^y(4dDUTcA~$Wy*X5+!Df=jA-izLI$@^JeDl%+uLtvd`sp<#iW$iXizG@m6tN z&axb;XrU+|hn5qR6Ph!bJ(V|;7a@V9u>3;K#hh(9xuOISHzzrVmy?>q&q>b_h*yh+ z5=4r~@8w*|*)D1n>BI(cvv{-EEVhVkVpNQa2?>w_c~4HSXus%S&SCKp@lo+{@k#M1 z@fq^X5)tMDp6}c7p6&os~6|#!5jTObh4a9oqdJkDa;l1j=RP3$T zU-4PR=M~2)PF1uN?jSQ7lp?Q zPv+mvpUkHhF^hy`b(C+Z-CCur$|=t)O)MHJ94!nkSXq!>ATO#cB1#>lt|~7@PgQT# z*X5syxCJB;+N+t`YikPwp87xN>7o-=Z+a$S?1PND?Ea6E~ zC45P`L?B%)tCAsdptvWwB-t)$l;|V|Nwajb)GW0~ZBkT<%Lo~eI}|;VUdevRLCIn1 z5$RFs3E4^6Y1tXsIoWyHE}28_RNR;JN!lb=Bv+-^r8i}_WOrnDW#7v>WSz2ZnM>|c zJdpHD1|);hVd;qM7vW!gXXI{D*QFqm+qWb)|J>brp5OYGR|a z*i#IbfszaLd+L5ux4rJQy0_}yt$V+&rEW)c=f>$`W(iRON}Od&8={on%D(D{)sLzl zSC3XtREL#il*vnWmb8-9Q})M(t;#y3x+br(pt7*CxKdVWEo&+1DCsJ3mqF!7l~?0j z)qUmHHGiu-RCc87SlP+4yCst)^ipQIupB9OR8=?Ds@ADEwQ*Jc<%`Q{<-z4EOVdl` z<(1_GSzWdF8vmmDlWJe>@2a%rhH_)Mx!hW6E8S6kzPz={RRyWnXrk0?^*qJHsw?H! z%5Ro`P;|QVY-vY%SGl_iQULuH#a2a~Vws#OTPO>V(PTlgP}#Fmx|}JGKwyPKe*w9O zY?J585@cLivWzDyk;!D`GJ(8OUWFiJzlU6sZ9DkjuZ`e|}AdN(-_IWNOp!%K$w z20z0h!xBS~A=JPyL~MfUk!nYUs{*d9He?#I3@;nR28p4_P-56vi>y?@sU5%l}SYxWO*0fZ1RCZOmE1@c+_Fhv@(_gjUDBEhj zt+`fnv*uRK-I~ctdKI%uNLEMfn&!;rb-HCLYVE?>BYVFF}^eTB(WfehIm+C_E zp5{O4eyh^d>S~*6jkTs)YptznN7eb-R{2`RE=!N17uhdAh#W?a zAV-lCij#`dinEGyit~zAwTtZckv@4Fas|1HTt{vyZYl04+ST8yJJnt4ZnAqU59IyG z05XUSBO{7Y#hCgR;a`0%{qpB^=pR)xWt_3NXXmjzpOx5!Aekb!MfY}mEjvho8eo- zb;C`=Z9}`E(=c7nR1!*{bSjtH=Gb0pifxE*NNQN#z-vftSlN)#AXn~GwvyGO++wS- zshVDGcwPCX@@?hsmG3J*RJJHPlwC@<5>g?md$x zYDo21^+ffwalG+aBVEJP2+8V1FQ6CEZN^+pf|{#NR`b*)8kr_TU7@Me>@qqn9&pci zNxxmwsMe_s>Spz3wOMV|{6X`vW~Zjr=puWMrdPdReNcT^eMEg!eL{Uwb6Rs&^QGpz zrhB&ESNEyg)K}D3)z{TG)weWvH0_#BW0$d;9O(xhDEbuxib3_TdPF^{8PiPsD*Rm6 z17@pY=pR-8+}{KKIWKH3=7Y`0sMta*0Ha|cSQy5@APm{;*yO5*8>%sdRcWoaYOGpo zlhtT7Tdh{qN?4tnJ)7VL&~O2}WbHHb8-6xCG7KA@7@iu&4bKeI2BwzKf(B>9Qk-Jr zH05d6YYVg+v{G$}R;De}%C$SSty-tn(@>2oY}=cDr~OuYO?yLoQ+rE$N87IL&~|Cv zT1ba9-or21zHa)PcA;*uZi$Yj3(|$?!gO>UQzz6RI)`p4!LoCj<8%eO4Z0#-v93fX z)0OGux=I~ER+nxIp|Go)8+C8$-qyXVdr$X)?n7ORZinu?u9d8i@g8x>zOVUH-C^Ak z-3{G$y4$+Dx^`WMu1n`8E3m8qEOegnq3)4xST~{@)dlNA_2GKDo~aj-)rtNQ{1=*I zjMFFSm+M#PQ}k*2jrww9g|X7Oi>#zSxP)#uHtKbHgT7h6S#Q=`^?xv8`c{jJtfarC z*SKGQP=8o|M1NF&LVr?!T7TBqW$Av=@9X zA87hD1DZk2ux3O*svpx&7^f^Vv*j1#e)WKQP&1?%(fp_C0h!o3EE~(k#8?4Vh)J;$ zY$H~VRbmL{u(}Meb}P0Q+lL*%4q}I~BiJ$Q1a=BLgMEoPG0$eW321w;UTnU}*W_nf zXj*KdnF3A0rZ5xT#5562pvkF?!lUte)9a=;O>djtG5y~3zUf0#i)n{xr>V8c+2qk~ z#b3eqoBnS4)^yEu!}Oi$mg$bE-PB>~GP#?eW~BKq_+Xo94I8@0w4T zPnu7g&zR4d&zoDDU1rGg7h*55-+a(~*nG`=!+gtp+kDsjy}85OWp+2E9#n6>H)oAzvZCiu;qy5sO5y^q~)~btfdR>o~<5m z-_mDnGhQ)XHC{K~G~P1av9wz{pX~# z{eP|=@EdF!_FL?C*z4Gv*xT6evG=eKu@-Cxwi9z;E-P&ME7phoggwLtu}9c2_5>Tn z#;{5388(f1FxUo6-Z%%>*f!a8HiNCnX0(}X7Msmxw_!HI25e5#I$Vu^W;@g6($;Eo+B~K|;rsA5+n{a8Hf$TQjoO~t#%+_fXSQjZ+XmSY^I!2k zoND*CbM47?o;}5$X6M_}?E?EMyU>o<9cDJcA;k84yTsmPH`+~hv)yX9*-<-YC+rTp z%UnmOiP!9J*x$0hV?Sm;VLxd(mQpRv2i3efvRA2DDbv=7-I+i7SJ%16`D40IK`8Wob&3D|%G;?YEuizcHyv;>u* zW$4G~PIMPJCuvj%)Ifu3Q9as(8c`E!L0ix-(QeQUT(g3I1^d8j=o{!;=sW1|(f83) z=oz$=?4B395BfkGdIi0TUPo`Dx6nIiJK5d8_6L@Jbigu*4x=OJC_08tprrq=mHhsn zy^bNvh-K6=X8GUM1HQt(!7gKM*cI$5b{)HkeTUt~?qc6#omdyQ2exdy0oUMKT!$O*X55IIa0_n5?KpYom_$mAheir`{Z^fOs$MzL|86Ut0@x?>{v4jXDf{73!j0h(fL<9j5i2VV+ zfS?kI#B!pDkP;H)#J>q@hL*gUi55x}QV`3NK zAY6osc$IjKc!PMGI7%ERZWDKicH(=YgXko>$qIo#6PJn4h%3Z3;s!BFj1i$A41@y) zV1ft$0RSEl{low3k;wcYzAiV5jY3B{>5h-con<`-T-fdcfot$BsdK^{;hunE`v631zZC+ zz<1y_xJ&kb^?d;P!2lQp!(arAf-x`wrv9yy*MSbAL;t*vf2$r4i^t&!q%W8BT`}vM zM*61Xf)~R7(ADEjr0?bzzBU{sg$Yvl)n9eLz>mG~Jx%(adm(%oZzFYw@W=QF{se!D zkKyC^B>oJa!e?+d?!o(UD&bFXXLXBz^(`lTD`$mciFhKPki5|S;9q=q&I;!e8d6_R zy!%4;?ytUGv%gNLqDEg239?$?ZhW= literal 0 HcmV?d00001 diff --git a/include/battle.h b/include/battle.h index 73caed16fd..0ed09caada 100644 --- a/include/battle.h +++ b/include/battle.h @@ -128,36 +128,36 @@ struct UnknownFlags struct DisableStruct { - u32 transformedMonPersonality; - u16 disabledMove; - u16 encoredMove; - u8 protectUses; - u8 stockpileCounter; - u8 substituteHP; - u8 disableTimer:4; - u8 disableTimerStartValue:4; - u8 encoredMovePos; - u8 filler_D; // Unused field. - u8 encoreTimer:4; - u8 encoreTimerStartValue:4; - u8 perishSongTimer:4; - u8 perishSongTimerStartValue:4; - u8 furyCutterCounter; - u8 rolloutTimer:4; - u8 rolloutTimerStartValue:4; - u8 chargeTimer:4; - u8 chargeTimerStartValue:4; - u8 tauntTimer:4; - u8 tauntTimer2:4; - u8 battlerPreventingEscape; - u8 battlerWithSureHit; - u8 isFirstTurn; - u8 unk17; - u8 truantCounter:1; - u8 truantUnknownBit:1; - u8 unk18_a_2:2; - u8 unk18_b:4; - u8 rechargeTimer; + u32 transformedMonPersonality; + u16 disabledMove; + u16 encoredMove; + u8 protectUses; + u8 stockpileCounter; + u8 substituteHP; + u8 disableTimer:4; + u8 disableTimerStartValue:4; + u8 encoredMovePos; + u8 filler_D; // Unused field. + u8 encoreTimer:4; + u8 encoreTimerStartValue:4; + u8 perishSongTimer:4; + u8 perishSongTimerStartValue:4; + u8 furyCutterCounter; + u8 rolloutTimer:4; + u8 rolloutTimerStartValue:4; + u8 chargeTimer:4; + u8 chargeTimerStartValue:4; + u8 tauntTimer:4; + u8 tauntTimer2:4; + u8 battlerPreventingEscape; + u8 battlerWithSureHit; + u8 isFirstTurn; + u8 filler_17; // Unused field. + u8 truantCounter:1; + u8 truantSwitchInHack:1; + u8 filler_18_2:2; // Unused field. + u8 mimickedMoves:4; + u8 rechargeTimer; }; struct ProtectStruct @@ -181,7 +181,7 @@ struct ProtectStruct u32 flag2Unknown:1; u32 flinchImmobility:1; u32 notFirstStrike:1; - u32 flag_x10:1; + u32 palaceAbleToUseMove:1; u32 physicalDmg; u32 specialDmg; u8 physicalBattlerId; @@ -300,8 +300,8 @@ struct BattleResults u8 playerFaintCounter; // 0x0 u8 opponentFaintCounter; // 0x1 u8 playerSwitchesCounter; // 0x2 - u8 unk3; // 0x3 - u8 unk4; // 0x4 + u8 numHealingItemsUsed; // 0x3 + u8 numRevivesUsed; // 0x4 u8 playerMonWasDamaged:1; // 0x5 u8 usedMasterBall:1; // 0x5 u8 caughtMonBall:4; // 0x5 @@ -441,8 +441,8 @@ struct BattleStruct u8 safariPkblThrowCounter; u8 safariEscapeFactor; u8 safariCatchFactor; - u8 field_7D; // unknown spriteId - u8 field_7E; // unknown spriteId + u8 linkBattleVsSpriteId_V; // The letter "V" + u8 linkBattleVsSpriteId_S; // The letter "S" u8 formToChangeInto; u8 chosenMovePositions[MAX_BATTLERS_COUNT]; u8 stateIdAfterSelScript[MAX_BATTLERS_COUNT]; diff --git a/include/battle_util.h b/include/battle_util.h index b3fff196e7..71bb22a005 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -42,9 +42,9 @@ #define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) u8 GetBattlerForBattleScript(u8 caseId); -void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); -void PressurePPLoseOnUsingPerishSong(u8 bankAtk); -void PressurePPLoseOnUsingImprision(u8 bankAtk); +void PressurePPLose(u8 target, u8 attacker, u16 move); +void PressurePPLoseOnUsingPerishSong(u8 attacker); +void PressurePPLoseOnUsingImprision(u8 attacker); void MarkAllBattlersForControllerExec(void); // unused void MarkBattlerForControllerExec(u8 battlerId); void sub_803F850(u8 arg0); diff --git a/include/global.tv.h b/include/global.tv.h index 61f014984f..aa151a75c8 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -521,13 +521,13 @@ struct GabbyAndTyData /*2bad*/ u8 battleNum; /*2bae*/ u8 battleTookMoreThanOneTurn:1; /*2bae*/ u8 playerLostAMon:1; - /*2bae*/ u8 playerUsedAnItem:1; + /*2bae*/ u8 playerUsedHealingItem:1; /*2bae*/ u8 playerThrewABall:1; /*2bae*/ u8 onAir:1; /*2bae*/ u8 valA_5:3; /*2baf*/ u8 battleTookMoreThanOneTurn2:1; /*2baf*/ u8 playerLostAMon2:1; - /*2baf*/ u8 playerUsedAnItem2:1; + /*2baf*/ u8 playerUsedHealingItem2:1; /*2baf*/ u8 playerThrewABall2:1; /*2baf*/ u8 valB_4:4; }; diff --git a/ld_script.txt b/ld_script.txt index 05c604febb..caac5c0bd9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -439,14 +439,13 @@ SECTIONS { src/start_menu.o(.rodata); src/tileset_anims.o(.rodata); src/palette.o(.rodata); - data/fanfares.o(.rodata); + src/sound.o(.rodata); src/battle_anim.o(.rodata); src/battle_anim_80A5C6C.o(.rodata); data/map_events.o(.rodata); data/battle_anim_80A9C70.o(.rodata); src/battle_anim_80A9C70.o(.rodata); src/title_screen.o(.rodata); - data/field_weather.o(.rodata); src/field_weather.o(.rodata); src/field_weather_effect.o(.rodata); src/field_screen_effect.o(.rodata); diff --git a/src/battle_bg.c b/src/battle_bg.c index a072a2cda0..61a914fc93 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -1037,10 +1037,10 @@ void sub_8035D74(u8 taskId) case 1: palId = AllocSpritePalette(0x2710); gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF; - gBattleStruct->field_7D = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0); - gBattleStruct->field_7E = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0); - gSprites[gBattleStruct->field_7D].invisible = TRUE; - gSprites[gBattleStruct->field_7E].invisible = TRUE; + gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0); + gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0); + gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = TRUE; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = TRUE; gTasks[taskId].data[0]++; break; case 2: @@ -1071,15 +1071,15 @@ void sub_8035D74(u8 taskId) PlaySE(SE_W231); DestroyTask(taskId); - gSprites[gBattleStruct->field_7D].invisible = FALSE; - gSprites[gBattleStruct->field_7E].invisible = FALSE; - gSprites[gBattleStruct->field_7E].oam.tileNum += 0x40; - gSprites[gBattleStruct->field_7D].data[0] = 0; - gSprites[gBattleStruct->field_7E].data[0] = 1; - gSprites[gBattleStruct->field_7D].data[1] = gSprites[gBattleStruct->field_7D].pos1.x; - gSprites[gBattleStruct->field_7E].data[1] = gSprites[gBattleStruct->field_7E].pos1.x; - gSprites[gBattleStruct->field_7D].data[2] = 0; - gSprites[gBattleStruct->field_7E].data[2] = 0; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = FALSE; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = FALSE; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].oam.tileNum += 0x40; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[0] = 0; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[0] = 1; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_V].pos1.x; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_S].pos1.x; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[2] = 0; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[2] = 0; } break; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index a6a6ac0f33..70b0a61608 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -696,10 +696,10 @@ static void HandleMoveSwitching(void) moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]] = moveInfo->maxPp[gMultiUsePlayerCursor]; moveInfo->maxPp[gMultiUsePlayerCursor] = i; - if (gDisableStructs[gActiveBattler].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBattler]]) + if (gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[gMoveSelectionCursor[gActiveBattler]]) { - gDisableStructs[gActiveBattler].unk18_b &= (~gBitTable[gMoveSelectionCursor[gActiveBattler]]); - gDisableStructs[gActiveBattler].unk18_b |= gBitTable[gMultiUsePlayerCursor]; + gDisableStructs[gActiveBattler].mimickedMoves &= (~gBitTable[gMoveSelectionCursor[gActiveBattler]]); + gDisableStructs[gActiveBattler].mimickedMoves |= gBitTable[gMultiUsePlayerCursor]; } MoveSelectionDisplayMoveNames(); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 3ceaef983d..089d095582 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -205,13 +205,13 @@ u16 ChooseMoveAndTargetInBattlePalace(void) if (Random() % 100 > 49) { - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; return 0; } } else { - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; return 0; } } diff --git a/src/battle_intro.c b/src/battle_intro.c index 21e83ed29e..043cf855aa 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -463,10 +463,10 @@ static void BattleIntroSlideLink(u8 taskId) if (--gTasks[taskId].data[2] == 0) { gTasks[taskId].data[0]++; - gSprites[gBattleStruct->field_7D].oam.objMode = ST_OAM_OBJ_WINDOW; - gSprites[gBattleStruct->field_7D].callback = sub_8038B74; - gSprites[gBattleStruct->field_7E].oam.objMode = ST_OAM_OBJ_WINDOW; - gSprites[gBattleStruct->field_7E].callback = sub_8038B74; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].callback = sub_8038B74; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].callback = sub_8038B74; SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2); } diff --git a/src/battle_main.c b/src/battle_main.c index 1aeaa25cab..6d04103e54 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3196,7 +3196,7 @@ void SwitchInClearSetData(void) gMoveResultFlags = 0; gDisableStructs[gActiveBattler].isFirstTurn = 2; - gDisableStructs[gActiveBattler].truantUnknownBit = disableStructCopy.truantUnknownBit; + gDisableStructs[gActiveBattler].truantSwitchInHack = disableStructCopy.truantSwitchInHack; gLastMoves[gActiveBattler] = 0; gLastLandedMoves[gActiveBattler] = 0; gLastHitByType[gActiveBattler] = 0; @@ -5492,7 +5492,7 @@ static void HandleAction_UseMove(void) // choose battlescript if (gBattleTypeFlags & BATTLE_TYPE_PALACE - && gProtectStructs[gBattlerAttacker].flag_x10) + && gProtectStructs[gBattlerAttacker].palaceAbleToUseMove) { if (gBattleMons[gBattlerAttacker].hp == 0) { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0995eec459..6bbee842ea 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1243,7 +1243,7 @@ static void atk03_ppreduce(void) gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 0; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) - && !((gDisableStructs[gBattlerAttacker].unk18_b) & gBitTable[gCurrMovePos])) + && !((gDisableStructs[gBattlerAttacker].mimickedMoves) & gBitTable[gCurrMovePos])) { gActiveBattler = gBattlerAttacker; BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]); @@ -5550,10 +5550,12 @@ static void atk52_switchineffects(void) } else { - if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBattler].truantUnknownBit) + // There is a hack here to ensure the truant counter will be 0 when the battler's next turn starts. + // The truant counter is not updated in the case where a mon switches in after a lost judgement in the battle arena. + if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBattler].truantSwitchInHack) gDisableStructs[gActiveBattler].truantCounter = 1; - gDisableStructs[gActiveBattler].truantUnknownBit = 0; + gDisableStructs[gActiveBattler].truantSwitchInHack = 0; if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) @@ -5774,7 +5776,7 @@ static void atk5A_yesnoboxlearnmove(void) if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[0].unk18_b & gBitTable[movePosition])) + && !(gDisableStructs[0].mimickedMoves & gBitTable[movePosition])) { RemoveBattleMonPPBonus(&gBattleMons[0], movePosition); SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, movePosition); @@ -5782,7 +5784,7 @@ static void atk5A_yesnoboxlearnmove(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[2].unk18_b & gBitTable[movePosition])) + && !(gDisableStructs[2].mimickedMoves & gBitTable[movePosition])) { RemoveBattleMonPPBonus(&gBattleMons[2], movePosition); SetBattleMonMoveSlot(&gBattleMons[2], gMoveToLearn, movePosition); @@ -6694,14 +6696,14 @@ static void atk76_various(void) gBattleMons[1].hp = 0; gHitMarker |= HITMARKER_FAINTED(1); gBattleStruct->arenaLostOpponentMons |= gBitTable[gBattlerPartyIndexes[1]]; - gDisableStructs[1].truantUnknownBit = 1; + gDisableStructs[1].truantSwitchInHack = 1; break; case VARIOUS_ARENA_PLAYER_MON_LOST: gBattleMons[0].hp = 0; gHitMarker |= HITMARKER_FAINTED(0); gHitMarker |= HITMARKER_x400000; gBattleStruct->arenaLostPlayerMons |= gBitTable[gBattlerPartyIndexes[0]]; - gDisableStructs[0].truantUnknownBit = 1; + gDisableStructs[0].truantSwitchInHack = 1; break; case VARIOUS_ARENA_BOTH_MONS_LOST: gBattleMons[0].hp = 0; @@ -6711,8 +6713,8 @@ static void atk76_various(void) gHitMarker |= HITMARKER_x400000; gBattleStruct->arenaLostPlayerMons |= gBitTable[gBattlerPartyIndexes[0]]; gBattleStruct->arenaLostOpponentMons |= gBitTable[gBattlerPartyIndexes[1]]; - gDisableStructs[0].truantUnknownBit = 1; - gDisableStructs[1].truantUnknownBit = 1; + gDisableStructs[0].truantSwitchInHack = 1; + gDisableStructs[1].truantSwitchInHack = 1; break; case VARIOUS_EMIT_YESNOBOX: BtlController_EmitUnknownYesNoBox(0); @@ -8021,7 +8023,7 @@ static void atk9B_transformdataexecution(void) gDisableStructs[gBattlerAttacker].disabledMove = 0; gDisableStructs[gBattlerAttacker].disableTimer = 0; gDisableStructs[gBattlerAttacker].transformedMonPersonality = gBattleMons[gBattlerTarget].personality; - gDisableStructs[gBattlerAttacker].unk18_b = 0; + gDisableStructs[gBattlerAttacker].mimickedMoves = 0; PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species) @@ -8095,7 +8097,7 @@ static void atk9D_mimicattackcopy(void) } else { - s32 i; + int i; for (i = 0; i < MAX_MON_MOVES; i++) { @@ -8114,7 +8116,7 @@ static void atk9D_mimicattackcopy(void) PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget]) - gDisableStructs[gBattlerAttacker].unk18_b |= gBitTable[gCurrMovePos]; + gDisableStructs[gBattlerAttacker].mimickedMoves |= gBitTable[gCurrMovePos]; gBattlescriptCurrInstr += 5; } else @@ -8571,7 +8573,7 @@ static void atkAD_tryspiteppreduce(void) gBattleMons[gBattlerTarget].pp[i] -= ppToDeduct; gActiveBattler = gBattlerTarget; - if (!(gDisableStructs[gActiveBattler].unk18_b & gBitTable[i]) + if (!(gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[i]) && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) { BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]); diff --git a/src/battle_util.c b/src/battle_util.c index 5d8e424829..04659571ed 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -78,38 +78,38 @@ u8 GetBattlerForBattleScript(u8 caseId) return ret; } -void PressurePPLose(u8 defender, u8 attacker, u16 move) +void PressurePPLose(u8 target, u8 attacker, u16 move) { - s32 i; + int moveIndex; - if (gBattleMons[defender].ability != ABILITY_PRESSURE) + if (gBattleMons[target].ability != ABILITY_PRESSURE) return; - for (i = 0; i < MAX_MON_MOVES; i++) + for (moveIndex = 0; moveIndex < MAX_MON_MOVES; moveIndex++) { - if (gBattleMons[attacker].moves[i] == move) + if (gBattleMons[attacker].moves[moveIndex] == move) break; } - if (i == MAX_MON_MOVES) // mons don't share any moves + if (moveIndex == MAX_MON_MOVES) return; - if (gBattleMons[attacker].pp[i] != 0) - gBattleMons[attacker].pp[i]--; + if (gBattleMons[attacker].pp[moveIndex] != 0) + gBattleMons[attacker].pp[moveIndex]--; if (!(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[attacker].unk18_b & gBitTable[i])) + && !(gDisableStructs[attacker].mimickedMoves & gBitTable[moveIndex])) { gActiveBattler = attacker; - BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]); + BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + moveIndex, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]); MarkBattlerForControllerExec(gActiveBattler); } } void PressurePPLoseOnUsingImprision(u8 attacker) { - s32 i, j; - s32 imprisionPos = 4; + int i, j; + int imprisionPos = 4; u8 atkSide = GetBattlerSide(attacker); for (i = 0; i < gBattlersCount; i++) @@ -132,7 +132,7 @@ void PressurePPLoseOnUsingImprision(u8 attacker) if (imprisionPos != 4 && !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[attacker].unk18_b & gBitTable[imprisionPos])) + && !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisionPos])) { gActiveBattler = attacker; BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]); @@ -142,8 +142,8 @@ void PressurePPLoseOnUsingImprision(u8 attacker) void PressurePPLoseOnUsingPerishSong(u8 attacker) { - s32 i, j; - s32 perishSongPos = 4; + int i, j; + int perishSongPos = 4; for (i = 0; i < gBattlersCount; i++) { @@ -165,7 +165,7 @@ void PressurePPLoseOnUsingPerishSong(u8 attacker) if (perishSongPos != MAX_MON_MOVES && !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[attacker].unk18_b & gBitTable[perishSongPos])) + && !(gDisableStructs[attacker].mimickedMoves & gBitTable[perishSongPos])) { gActiveBattler = attacker; BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]); @@ -175,7 +175,7 @@ void PressurePPLoseOnUsingPerishSong(u8 attacker) void MarkAllBattlersForControllerExec(void) // unused { - s32 i; + int i; if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -314,14 +314,14 @@ u8 TrySetCantSelectMoveBattleScript(void) u8 holdEffect; u16* choicedMove = &gBattleStruct->choicedMove[gActiveBattler]; - if (gDisableStructs[gActiveBattler].disabledMove == move && move != 0) + if (gDisableStructs[gActiveBattler].disabledMove == move && move != MOVE_NONE) { gBattleScripting.battler = gActiveBattler; gCurrentMove = move; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace; - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; } else { @@ -336,7 +336,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace; - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; } else { @@ -351,7 +351,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace; - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; } else { @@ -366,7 +366,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace; - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; } else { @@ -388,7 +388,7 @@ u8 TrySetCantSelectMoveBattleScript(void) gLastUsedItem = gBattleMons[gActiveBattler].item; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; } else { @@ -401,7 +401,7 @@ u8 TrySetCantSelectMoveBattleScript(void) { if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - gProtectStructs[gActiveBattler].flag_x10 = 1; + gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; } else { @@ -3035,7 +3035,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) MarkBattlerForControllerExec(gActiveBattler); break; case ITEM_PP_CHANGE: - if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[battlerId].unk18_b & gBitTable[i])) + if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[i])) gBattleMons[battlerId].pp[i] = changedPP; break; } diff --git a/src/field_weather.c b/src/field_weather.c index f0615dabff..21168426ca 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -17,7 +17,7 @@ #include "trig.h" #include "gpu_regs.h" -#define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) +#define DROUGHT_COLOR_INDEX(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) enum { @@ -65,15 +65,21 @@ static void None_Init(void); static void None_Main(void); static u8 None_Finish(void); -// EWRAM EWRAM_DATA struct Weather gWeather = {0}; EWRAM_DATA static u8 sFieldEffectPaletteGammaTypes[32] = {0}; -// IWRAM bss IWRAM_DATA static const u8 *sPaletteGammaTypes; -// CONST -extern const u16 gUnknown_0854014C[][4096]; +// The drought weather effect uses a precalculated color lookup table. Presumably this +// is because the underlying color shift calculation is slow. +const u16 sDroughtWeatherColors[][0x1000] = { + INCBIN_U16("graphics/weather/drought/0.gbapal"), + INCBIN_U16("graphics/weather/drought/1.gbapal"), + INCBIN_U16("graphics/weather/drought/2.gbapal"), + INCBIN_U16("graphics/weather/drought/3.gbapal"), + INCBIN_U16("graphics/weather/drought/4.gbapal"), + INCBIN_U16("graphics/weather/drought/5.gbapal"), +}; // This is a pointer to gWeather. All code in this file accesses gWeather directly, // while code in other field weather files accesses gWeather through this pointer. @@ -513,7 +519,7 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) { for (i = 0; i < 16; i++) { - gPlttBufferFaded[palOffset] = gUnknown_0854014C[gammaIndex][MACRO1(gPlttBufferUnfaded[palOffset])]; + gPlttBufferFaded[palOffset] = sDroughtWeatherColors[gammaIndex][DROUGHT_COLOR_INDEX(gPlttBufferUnfaded[palOffset])]; palOffset++; } } @@ -619,7 +625,7 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl b1 = color1.b; offset = ((b1 & 0x1E) << 7) | ((g1 & 0x1E) << 3) | ((r1 & 0x1E) >> 1); - color2 = *(struct RGBColor *)&gUnknown_0854014C[gammaIndex][offset]; + color2 = *(struct RGBColor *)&sDroughtWeatherColors[gammaIndex][offset]; r2 = color2.r; g2 = color2.g; b2 = color2.b; diff --git a/src/pokemon.c b/src/pokemon.c index 174f7ae662..cdb87f464f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5242,14 +5242,14 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { gAbsentBattlerFlags &= ~gBitTable[battlerId]; CopyPlayerPartyMonToBattleData(battlerId, pokemon_order_func(gBattlerPartyIndexes[battlerId])); - if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.unk4 < 255) - gBattleResults.unk4++; + if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.numRevivesUsed < 255) + gBattleResults.numRevivesUsed++; } else { gAbsentBattlerFlags &= ~gBitTable[gActiveBattler ^ 2]; - if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.unk4 < 255) - gBattleResults.unk4++; + if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleResults.numRevivesUsed < 255) + gBattleResults.numRevivesUsed++; } } } @@ -5289,8 +5289,8 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov gBattleMons[battlerId].hp = dataUnsigned; if (!(r10 & 0x10) && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { - if (gBattleResults.unk3 < 255) - gBattleResults.unk3++; + if (gBattleResults.numHealingItemsUsed < 255) + gBattleResults.numHealingItemsUsed++; // I have to re-use this variable to match. r5 = gActiveBattler; gActiveBattler = battlerId; @@ -5329,7 +5329,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov SetMonData(mon, MON_DATA_PP1 + r5, &dataUnsigned); if (gMain.inBattle && battlerId != 4 && !(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[battlerId].unk18_b & gBitTable[r5])) + && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[r5])) gBattleMons[battlerId].pp[r5] = dataUnsigned; retVal = FALSE; } @@ -5354,7 +5354,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov SetMonData(mon, MON_DATA_PP1 + moveIndex, &dataUnsigned); if (gMain.inBattle && battlerId != 4 && !(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[battlerId].unk18_b & gBitTable[moveIndex])) + && !(gDisableStructs[battlerId].mimickedMoves & gBitTable[moveIndex])) gBattleMons[battlerId].pp[moveIndex] = dataUnsigned; retVal = FALSE; } diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 0dae76f027..c11dc55e7c 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -782,7 +782,7 @@ void sub_818603C(u8 arg0) movePp.moves[j] = gBattleMons[battlerId].moves[array1[j]]; movePp.pp[j] = gBattleMons[battlerId].pp[array1[j]]; array3[j] = ppBonuses[array1[j]]; - array2[j] = (gDisableStructs[battlerId].unk18_b & gBitTable[j]) >> j; + array2[j] = (gDisableStructs[battlerId].mimickedMoves & gBitTable[j]) >> j; } for (j = 0; j < MAX_MON_MOVES; j++) { @@ -790,11 +790,11 @@ void sub_818603C(u8 arg0) gBattleMons[battlerId].pp[j] = movePp.pp[j]; } gBattleMons[battlerId].ppBonuses = 0; - gDisableStructs[battlerId].unk18_b = 0; + gDisableStructs[battlerId].mimickedMoves = 0; for (j = 0; j < MAX_MON_MOVES; j++) { gBattleMons[battlerId].ppBonuses |= (array3[j]) << (j << 1); - gDisableStructs[battlerId].unk18_b |= (array2[j]) << (j); + gDisableStructs[battlerId].mimickedMoves |= (array2[j]) << (j); } if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED)) diff --git a/src/sound.c b/src/sound.c index c63183bdc3..ebb4fad75d 100644 --- a/src/sound.c +++ b/src/sound.c @@ -34,13 +34,33 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE3; extern struct ToneData gCryTable[]; extern struct ToneData gCryTable2[]; -extern const struct Fanfare sFanfares[]; static void Task_Fanfare(u8 taskId); static void CreateFanfareTask(void); static void Task_DuckBGMForPokemonCry(u8 taskId); static void RestoreBGMVolumeAfterPokemonCry(void); +static const struct Fanfare sFanfares[] = { + { MUS_FANFA1, 80 }, + { MUS_FANFA4, 160 }, + { MUS_FANFA5, 220 }, + { MUS_ME_WAZA, 220 }, + { MUS_ME_ASA, 160 }, + { MUS_ME_BACHI, 340 }, + { MUS_ME_WASURE, 180 }, + { MUS_ME_KINOMI, 120 }, + { MUS_ME_TAMA, 710 }, + { MUS_ME_B_BIG, 250 }, + { MUS_ME_B_SMALL, 150 }, + { MUS_ME_ZANNEN, 160 }, + { MUS_RG_POKEFUE, 450 }, + { MUS_RG_FAN5, 170 }, + { MUS_RG_FAN2, 196 }, + { MUS_ME_POINTGET, 313 }, + { MUS_ME_SYMBOLGET, 318 }, + { MUS_ME_TORE_EYE, 135 }, +}; + #define CRY_VOLUME 120 // was 125 in R/S void InitMapMusic(void) diff --git a/src/tv.c b/src/tv.c index dfb4a3a64b..5b640836f1 100644 --- a/src/tv.c +++ b/src/tv.c @@ -913,13 +913,13 @@ void ResetGabbyAndTy(void) gSaveBlock1Ptr->gabbyAndTyData.quote[0] = -1; gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn = FALSE; gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon = FALSE; - gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem = FALSE; + gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem = FALSE; gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall = FALSE; gSaveBlock1Ptr->gabbyAndTyData.onAir = FALSE; gSaveBlock1Ptr->gabbyAndTyData.valA_5 = 0; gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn2 = FALSE; gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon2 = FALSE; - gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem2 = FALSE; + gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem2 = FALSE; gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall2 = FALSE; gSaveBlock1Ptr->gabbyAndTyData.valB_4 = 0; gSaveBlock1Ptr->gabbyAndTyData.mapnum = 0; @@ -946,13 +946,13 @@ void GabbyAndTyBeforeInterview(void) { gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon = FALSE; } - if (gBattleResults.unk3 != 0) + if (gBattleResults.numHealingItemsUsed != 0) { - gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem = TRUE; + gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem = TRUE; } else { - gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem = FALSE; + gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem = FALSE; } if (!gBattleResults.usedMasterBall) { @@ -980,7 +980,7 @@ void GabbyAndTyAfterInterview(void) { gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn2 = gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn; gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon2 = gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon; - gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem2 = gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem; + gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem2 = gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem; gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall2 = gSaveBlock1Ptr->gabbyAndTyData.playerThrewABall; gSaveBlock1Ptr->gabbyAndTyData.onAir = TRUE; gSaveBlock1Ptr->gabbyAndTyData.mapnum = gMapHeader.regionMapSectionId; @@ -1027,7 +1027,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void) { return 2; } - if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem2) + if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem2) { return 3; } @@ -6141,7 +6141,7 @@ void DoTVShowInSearchOfTrainers(void) { sTVShowState = 5; } - else if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedAnItem) + else if (gSaveBlock1Ptr->gabbyAndTyData.playerUsedHealingItem) { sTVShowState = 6; } From 36a1825bbe6199ea00a8cb614c1dd126f736daeb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 20 Jan 2019 10:11:45 -0600 Subject: [PATCH 14/42] Document trainer approach funcs, and use movement type constants in scripts --- data/event_scripts.s | 1 + .../scripts.inc | 2 +- data/maps/LavaridgeTown/scripts.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 8 +- data/maps/LavaridgeTown_Gym_B1F/scripts.inc | 8 +- data/maps/LittlerootTown/scripts.inc | 6 +- .../scripts.inc | 6 +- .../scripts.inc | 2 +- .../LittlerootTown_MaysHouse_1F/scripts.inc | 6 +- .../LittlerootTown_MaysHouse_2F/scripts.inc | 2 +- .../scripts.inc | 4 +- .../MossdeepCity_SpaceCenter_1F/scripts.inc | 10 +-- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 8 +- .../MossdeepCity_StevensHouse/scripts.inc | 2 +- .../MtChimney_CableCarStation/scripts.inc | 4 +- data/maps/OldaleTown/scripts.inc | 4 +- data/maps/Route104_MrBrineysHouse/scripts.inc | 4 +- data/maps/Route110/scripts.inc | 4 +- .../maps/Route112_CableCarStation/scripts.inc | 4 +- .../Route114_FossilManiacsTunnel/scripts.inc | 2 +- .../Route119_WeatherInstitute_1F/scripts.inc | 2 +- .../Route119_WeatherInstitute_2F/scripts.inc | 6 +- data/maps/Route120/scripts.inc | 2 +- data/maps/RustboroCity/scripts.inc | 10 +-- .../RustboroCity_DevonCorp_1F/scripts.inc | 2 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 2 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SlateportCity/scripts.inc | 20 ++--- data/maps/SlateportCity_Harbor/scripts.inc | 4 +- data/maps/SootopolisCity/scripts.inc | 14 +-- .../scripts.inc | 4 +- data/maps/VictoryRoad_1F/scripts.inc | 4 +- src/trainer_see.c | 89 ++++++++++--------- 33 files changed, 126 insertions(+), 124 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1da2a016ff..3877d6183c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2,6 +2,7 @@ #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/event_objects.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index d92c6cbf41..7dbeee0427 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -968,7 +968,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 compare VAR_TEMP_D, 0 goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 - setobjectmovementtype 6, 10 + setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 82a3b8469c..899df4d2cd 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -28,7 +28,7 @@ LavaridgeTown_EventScript_1EA518:: @ 81EA518 LavaridgeTown_EventScript_1EA529:: @ 81EA529 setobjectxyperm 8, 11, 9 setobjectxyperm 7, 9, 8 - setobjectmovementtype 7, 7 + setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 return diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 06ea54a989..bf48225eca 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -38,22 +38,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 checktrainerflag TRAINER_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764 - setobjectmovementtype 2, 63 + setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 checktrainerflag TRAINER_GERALD goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771 - setobjectmovementtype 3, 63 + setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 checktrainerflag TRAINER_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E - setobjectmovementtype 4, 63 + setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E checktrainerflag TRAINER_DANIELLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B - setobjectmovementtype 5, 63 + setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B return diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index 222f368102..a8a6eaa545 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -37,22 +37,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC checktrainerflag TRAINER_KEEGAN goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 - setobjectmovementtype 2, 63 + setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 checktrainerflag TRAINER_JACE goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 - setobjectmovementtype 1, 63 + setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 checktrainerflag TRAINER_JEFF goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 - setobjectmovementtype 3, 63 + setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 checktrainerflag TRAINER_ELI goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 - setobjectmovementtype 4, 63 + setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 return diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index b7067f4516..5d9161cb42 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -56,17 +56,17 @@ LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F compare VAR_0x4050, 0 goto_if_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_EventScript_1E7E86:: @ 81E7E86 setobjectxyperm 1, 7, 2 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return LittlerootTown_EventScript_1E7E92:: @ 81E7E92 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN checkplayergender compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E7EB1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 8fa7adbcae..42cfe308b3 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -36,17 +36,17 @@ LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 setobjectxyperm 1, 8, 4 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 setobjectxyperm 1, 4, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE setobjectxyperm 1, 9, 8 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 8bd4b43b94..ea00693a83 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 compare VAR_0x40D3, 2 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 setobjectxyperm 1, 0, 2 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 25ebc1bbd8..36bda7e036 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -36,17 +36,17 @@ LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 setobjectxyperm 1, 2, 4 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E setobjectxyperm 1, 1, 8 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index ffc4a6519a..353437ad4f 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 compare VAR_0x40D3, 2 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 setobjectxyperm 1, 8, 2 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 1f65beda31..ee7e1730b5 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -19,7 +19,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD specialvar VAR_RESULT, HasAllHoennMons compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 - setobjectmovementtype 3, 3 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end @@ -33,7 +33,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 setmaplayoutindex 432 - setobjectmovementtype 3, 3 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 91eda813c8..e875be96fa 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -10,14 +10,14 @@ MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 3, 1, 9 - setobjectmovementtype 3, 10 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 5, 0, 8 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 4, 1, 6 - setobjectmovementtype 4, 10 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 1, 3, 4 - setobjectmovementtype 1, 10 - setobjectmovementtype 2, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT compare VAR_0x409E, 1 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA compare VAR_0x409E, 2 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 163f7045f3..0602c9dad1 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -13,11 +13,11 @@ MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER setobjectxyperm 3, 5, 3 - setobjectmovementtype 3, 10 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 2, 1, 3 - setobjectmovementtype 2, 10 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT return MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F @@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT removeobject 3 setobjectxyperm 3, 5, 6 - setobjectmovementtype 3, 2 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND addobject 3 fadescreen 0 end diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index d2bd91694e..51f1ac16e1 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -19,7 +19,7 @@ MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 8e52438c93..6c389e2ad3 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -10,7 +10,7 @@ MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 setobjectxyperm 1, 5, 4 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D @@ -24,7 +24,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 waitmovement 0 setvar VAR_0x40A3, 0 setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index c8a598da91..7431cbf2aa 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -16,12 +16,12 @@ OldaleTown_EventScript_1E8ECC:: @ 81E8ECC OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 setobjectxyperm 3, 1, 11 - setobjectmovementtype 3, 9 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT return OldaleTown_EventScript_1E8EDE:: @ 81E8EDE setobjectxyperm 2, 13, 14 - setobjectmovementtype 2, 8 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return OldaleTown_EventScript_1E8EEA:: @ 81E8EEA diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index ba1afc4289..17ed47206a 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -15,9 +15,9 @@ Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 setobjectxyperm 1, 9, 3 - setobjectmovementtype 1, 50 + setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT setobjectxyperm 2, 9, 6 - setobjectmovementtype 2, 51 + setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN return Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 0455ebb1fd..7c98cc6035 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -484,8 +484,8 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC call_if_eq Route110_EventScript_1EF998 compare VAR_0x8008, 3 call_if_eq Route110_EventScript_1EF9A0 - setobjectmovementtype 28, 10 - setobjectmovementtype 29, 10 + setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT removeobject 28 addobject 29 delay 45 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 037d7ca057..a430a497e5 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -11,7 +11,7 @@ Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 Route112_CableCarStation_EventScript_22AADD:: @ 822AADD setobjectxyperm 1, 7, 4 - setobjectmovementtype 1, 9 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT return Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 @@ -25,7 +25,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 waitmovement 0 setvar VAR_0x40A3, 0 setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index b98fd33217..96d591d2da 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -9,7 +9,7 @@ Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 8dada27e86..ae0fea2591 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -9,7 +9,7 @@ Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 setobjectxyperm 5, 0, 5 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e7d2cb03dc..bbee65df8a 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -12,17 +12,17 @@ Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 setobjectxyperm 5, 1, 6 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 setobjectxyperm 5, 4, 6 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C setobjectxyperm 5, 2, 2 - setobjectmovementtype 5, 7 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP return Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 5a601678dd..cd864e1dc5 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -57,7 +57,7 @@ Route120_EventScript_1F54A3:: @ 81F54A3 return Route120_EventScript_1F54C8:: @ 81F54C8 - setobjectmovementtype 36, 10 + setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT return Route120_MapScript1_1F54CD: @ 81F54CD diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 7c1e141187..8ffbf8373d 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -245,7 +245,7 @@ RustboroCity_EventScript_1E094E:: @ 81E094E RustboroCity_EventScript_1E095A:: @ 81E095A lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 0 goto RustboroCity_EventScript_1E09CD end @@ -253,7 +253,7 @@ RustboroCity_EventScript_1E095A:: @ 81E095A RustboroCity_EventScript_1E0971:: @ 81E0971 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 1 goto RustboroCity_EventScript_1E09CD end @@ -261,7 +261,7 @@ RustboroCity_EventScript_1E0971:: @ 81E0971 RustboroCity_EventScript_1E0988:: @ 81E0988 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 2 goto RustboroCity_EventScript_1E09CD end @@ -269,7 +269,7 @@ RustboroCity_EventScript_1E0988:: @ 81E0988 RustboroCity_EventScript_1E099F:: @ 81E099F lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 3 goto RustboroCity_EventScript_1E09CD end @@ -277,7 +277,7 @@ RustboroCity_EventScript_1E099F:: @ 81E099F RustboroCity_EventScript_1E09B6:: @ 81E09B6 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 4 goto RustboroCity_EventScript_1E09CD end diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 157947c2d9..a7a84335b9 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 setobjectxyperm 2, 14, 2 - setobjectmovementtype 2, 8 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index da78ccb4b7..9d5fbe58bc 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -11,7 +11,7 @@ RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 setobjectxyperm 2, 3, 2 - setobjectmovementtype 2, 9 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index c0bc2e4c14..c091991a32 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -24,7 +24,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 SkyPillar_Top_EventScript_2396FD:: @ 82396FD setmaplayoutindex 438 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return SkyPillar_Top_EventScript_239705:: @ 8239705 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 7b19c84b8f..2e7859fba2 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -26,13 +26,13 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99 setobjectxyperm 8, 28, 16 setobjectxyperm 1, 29, 16 setobjectxyperm 2, 31, 14 - setobjectmovementtype 11, 8 - setobjectmovementtype 7, 18 - setobjectmovementtype 3, 16 - setobjectmovementtype 6, 7 - setobjectmovementtype 8, 7 - setobjectmovementtype 1, 7 - setobjectmovementtype 2, 9 + setobjectmovementtype 11, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype 7, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT + setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 @@ -41,12 +41,12 @@ SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 compare VAR_0x8004, 30 goto_if_eq SlateportCity_EventScript_1DCD06 setobjectxyperm 35, 23, 27 - setobjectmovementtype 35, 10 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_EventScript_1DCD06:: @ 81DCD06 setobjectxyperm 35, 22, 27 - setobjectmovementtype 35, 10 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_MapScript2_1DCD12: @ 81DCD12 @@ -82,7 +82,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 removeobject 35 setobjectxyperm 35, 10, 12 - setobjectmovementtype 35, 8 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_SPECIAL_FLAG_0x4000 setvar VAR_0x40D2, 2 addvar VAR_0x40D1, 1 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 2f71a2dc99..24e139edfd 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -17,7 +17,7 @@ SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 savebgm MUS_AQA_0 setobjectxyperm 4, 12, 13 - setobjectmovementtype 4, 9 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS return @@ -78,7 +78,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE moveobjectoffscreen 4 - setobjectmovementtype 4, 10 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT releaseall end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index da5caab3f2..a116aeb568 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -70,10 +70,10 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 setobjectxyperm 5, 46, 32 setobjectxyperm 4, 48, 41 setobjectxyperm 8, 45, 43 - setobjectmovementtype 3, 7 - setobjectmovementtype 5, 9 - setobjectmovementtype 4, 9 - setobjectmovementtype 8, 9 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT return SootopolisCity_EventScript_1E57B2:: @ 81E57B2 @@ -150,17 +150,17 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 SootopolisCity_EventScript_1E58AF:: @ 81E58AF setobjectxyperm 18, 31, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58BB:: @ 81E58BB setobjectxyperm 18, 32, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58C7:: @ 81E58C7 setobjectxyperm 18, 30, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58D3:: @ 81E58D3 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 18b573fbdf..0493cb05ff 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -15,13 +15,13 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex 441 return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 setobjectxyperm 1, 2, 2 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20f36868ec..2d1c630273 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -11,12 +11,12 @@ VictoryRoad_1F_MapScript1_235D80: @ 8235D80 VictoryRoad_1F_EventScript_235D97:: @ 8235D97 setobjectxyperm 4, 2, 24 - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 setobjectxyperm 4, 3, 24 - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF diff --git a/src/trainer_see.c b/src/trainer_see.c index 3846eca46e..bc5d9cbc39 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -1,5 +1,4 @@ #include "global.h" -#include "constants/battle_setup.h" #include "battle_setup.h" #include "event_data.h" #include "event_object_movement.h" @@ -14,6 +13,8 @@ #include "trainer_hill.h" #include "util.h" #include "battle_pyramid.h" +#include "constants/battle_setup.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" extern void sub_809BE48(u16 npcId); @@ -33,17 +34,17 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static void SpriteCB_TrainerIcons(struct Sprite *sprite); @@ -73,25 +74,25 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { sub_80B4178, - sub_80B417C, - sub_80B41C0, - sub_80B4200, - sub_80B425C, - sub_80B4318, - sub_80B435C, - sub_80B4390, - sub_80B43AC, - sub_80B43E0, - sub_80B4438, - sub_80B44AC + TrainerExclamationMark, + WaitTrainerExclamationMark, + TrainerMoveToPlayer, + PlayerFaceApproachingTrainer, + WaitPlayerFaceApproachingTrainer, + RevealDisguisedTrainer, + WaitRevealDisguisedTrainer, + RevealHiddenTrainer, + PopOutOfAshHiddenTrainer, + JumpInPlaceHiddenTrainer, + WaitRevealHiddenTrainer, }; static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { - sub_80B43AC, - sub_80B43E0, - sub_80B4438, - sub_80B44AC, + RevealHiddenTrainer, + PopOutOfAshHiddenTrainer, + JumpInPlaceHiddenTrainer, + WaitRevealHiddenTrainer, }; static const struct OamData sOamData_Icons = @@ -433,7 +434,7 @@ static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) { u8 direction; @@ -445,7 +446,7 @@ static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *train return TRUE; } -static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -454,17 +455,17 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *train else { task->tFuncId++; - if (trainerObj->movementType == 57 || trainerObj->movementType == 58) + if (trainerObj->movementType == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->movementType == MOVEMENT_TYPE_MOUNTAIN_DISGUISE) task->tFuncId = 6; - if (trainerObj->movementType == 63) + if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN) task->tFuncId = 8; return TRUE; } } -static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) { if (task->tTrainerRange) { @@ -473,14 +474,14 @@ static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *train } else { - EventObjectSetHeldMovement(trainerObj, 0x3E); + EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } } return FALSE; } -static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { struct EventObject *playerObj; @@ -501,7 +502,7 @@ static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; @@ -511,18 +512,18 @@ static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, 0x59); + EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); task->tFuncId++; } return FALSE; } -static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (EventObjectClearHeldMovementIfFinished(trainerObj)) task->tFuncId = 3; @@ -530,18 +531,18 @@ static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, 0x3E); + EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } return FALSE; } -static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (EventObjectCheckHeldMovementStatus(trainerObj)) { @@ -555,7 +556,7 @@ static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { struct Sprite *sprite; @@ -574,7 +575,7 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->tFuncId = 3; From d2d44a97b8e7495f59fde92b02fece150b462dce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 13:05:47 -0600 Subject: [PATCH 15/42] Cleanup link contest map events --- data/map_events.s | 10 +++++----- data/maps/LinkContestRoom1/events.inc | 1 + data/maps/LinkContestRoom2/events.inc | 1 - data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/events.inc | 1 - data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/events.inc | 1 - data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/events.inc | 1 - data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/events.inc | 1 - data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/UnknownMap_25_29/events.inc | 1 - data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/events.inc | 1 - data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/events.inc | 1 - data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/events.inc | 1 - data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/events.inc | 1 - data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/events.inc | 3 --- data/maps/UnknownMap_25_34/header.inc | 2 +- 24 files changed, 17 insertions(+), 29 deletions(-) diff --git a/data/map_events.s b/data/map_events.s index 1d4813b733..6b20620764 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -387,17 +387,17 @@ .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/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/InsideOfTruck/events.inc" .include "data/maps/SSTidalCorridor/events.inc" .include "data/maps/SSTidalLowerDeck/events.inc" diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 5c1a3b9f41..7b6b875c28 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -16,3 +16,4 @@ LinkContestRoom1_EventObjects: @ 8539EFC object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 LinkContestRoom1_MapEvents:: @ 853A064 + map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc index 89cb251d59..e69de29bb2 100644 --- a/data/maps/LinkContestRoom2/events.inc +++ b/data/maps/LinkContestRoom2/events.inc @@ -1 +0,0 @@ -LinkContestRoom2_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index f9274e58b6..406b8e5c33 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,6 +1,6 @@ LinkContestRoom2: @ 8484E64 .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom2_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc index 1e1b194c6f..e69de29bb2 100644 --- a/data/maps/LinkContestRoom3/events.inc +++ b/data/maps/LinkContestRoom3/events.inc @@ -1 +0,0 @@ -LinkContestRoom3_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 1b445db4b7..1f5de7cf06 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,6 +1,6 @@ LinkContestRoom3: @ 8484E80 .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom3_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc index 56e608f203..e69de29bb2 100644 --- a/data/maps/LinkContestRoom4/events.inc +++ b/data/maps/LinkContestRoom4/events.inc @@ -1 +0,0 @@ -LinkContestRoom4_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 20720be06c..84dc7829b5 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,6 +1,6 @@ LinkContestRoom4: @ 8484E9C .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom4_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc index 90644518e6..e69de29bb2 100644 --- a/data/maps/LinkContestRoom5/events.inc +++ b/data/maps/LinkContestRoom5/events.inc @@ -1 +0,0 @@ -LinkContestRoom5_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index f2e9c6c55b..c6f64fdc77 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,6 +1,6 @@ LinkContestRoom5: @ 8484EB8 .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom5_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc index 802987a1d2..e69de29bb2 100644 --- a/data/maps/LinkContestRoom6/events.inc +++ b/data/maps/LinkContestRoom6/events.inc @@ -1 +0,0 @@ -LinkContestRoom6_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 225a99e465..5e4c09fbe5 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,6 +1,6 @@ LinkContestRoom6: @ 8484ED4 .4byte LinkContestRoom6_Layout - .4byte LinkContestRoom6_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc index 13ea1b8b97..e69de29bb2 100644 --- a/data/maps/UnknownMap_25_29/events.inc +++ b/data/maps/UnknownMap_25_29/events.inc @@ -1 +0,0 @@ -UnknownMap_25_29_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index a3777fd80e..c056dd072f 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,6 +1,6 @@ UnknownMap_25_29: @ 8484DBC .4byte UnknownMap_25_29_Layout - .4byte UnknownMap_25_29_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte UnknownMap_25_29_MapScripts .4byte 0x0 .2byte MUS_NIBI diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc index 0e221e2403..e69de29bb2 100644 --- a/data/maps/UnknownMap_25_30/events.inc +++ b/data/maps/UnknownMap_25_30/events.inc @@ -1 +0,0 @@ -UnknownMap_25_30_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index a4184b85dc..652fc466f5 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,6 +1,6 @@ UnknownMap_25_30: @ 8484DD8 .4byte UnknownMap_25_30_Layout - .4byte UnknownMap_25_30_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte UnknownMap_25_30_MapScripts .4byte 0x0 .2byte MUS_NIBI diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc index 99e450de5d..e69de29bb2 100644 --- a/data/maps/UnknownMap_25_31/events.inc +++ b/data/maps/UnknownMap_25_31/events.inc @@ -1 +0,0 @@ -UnknownMap_25_31_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index ec4838bd5e..d90c49d684 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,6 +1,6 @@ UnknownMap_25_31: @ 8484DF4 .4byte UnknownMap_25_31_Layout - .4byte UnknownMap_25_31_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte UnknownMap_25_31_MapScripts .4byte 0x0 .2byte MUS_NIBI diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc index c48eedb17a..e69de29bb2 100644 --- a/data/maps/UnknownMap_25_32/events.inc +++ b/data/maps/UnknownMap_25_32/events.inc @@ -1 +0,0 @@ -UnknownMap_25_32_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 39e9820933..100aaca195 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,6 +1,6 @@ UnknownMap_25_32: @ 8484E10 .4byte UnknownMap_25_32_Layout - .4byte UnknownMap_25_32_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte UnknownMap_25_32_MapScripts .4byte 0x0 .2byte MUS_NIBI diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc index 14f4571d23..e69de29bb2 100644 --- a/data/maps/UnknownMap_25_33/events.inc +++ b/data/maps/UnknownMap_25_33/events.inc @@ -1 +0,0 @@ -UnknownMap_25_33_MapEvents:: @ 853A064 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 87f8b0c1ee..31670d1ad8 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,6 +1,6 @@ UnknownMap_25_33: @ 8484E2C .4byte UnknownMap_25_33_Layout - .4byte UnknownMap_25_33_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte UnknownMap_25_33_MapScripts .4byte 0x0 .2byte MUS_NIBI diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc index 975f08470d..e69de29bb2 100644 --- a/data/maps/UnknownMap_25_34/events.inc +++ b/data/maps/UnknownMap_25_34/events.inc @@ -1,3 +0,0 @@ -UnknownMap_25_34_MapEvents:: @ 853A064 - map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index c053c5e199..6bad2af809 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,6 +1,6 @@ UnknownMap_25_34: @ 8484E48 .4byte UnknownMap_25_34_Layout - .4byte UnknownMap_25_34_MapEvents + .4byte LinkContestRoom1_MapEvents .4byte UnknownMap_25_34_MapScripts .4byte 0x0 .2byte MUS_NIBI From 8f832434e57a14a661d22b151d90af3bb55f463a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 13:08:46 -0600 Subject: [PATCH 16/42] Change drought colors table files to .bin --- graphics/weather/drought/{0.gbapal => colors_0.bin} | Bin graphics/weather/drought/{1.gbapal => colors_1.bin} | Bin graphics/weather/drought/{2.gbapal => colors_2.bin} | Bin graphics/weather/drought/{3.gbapal => colors_3.bin} | Bin graphics/weather/drought/{4.gbapal => colors_4.bin} | Bin graphics/weather/drought/{5.gbapal => colors_5.bin} | Bin src/field_weather.c | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename graphics/weather/drought/{0.gbapal => colors_0.bin} (100%) rename graphics/weather/drought/{1.gbapal => colors_1.bin} (100%) rename graphics/weather/drought/{2.gbapal => colors_2.bin} (100%) rename graphics/weather/drought/{3.gbapal => colors_3.bin} (100%) rename graphics/weather/drought/{4.gbapal => colors_4.bin} (100%) rename graphics/weather/drought/{5.gbapal => colors_5.bin} (100%) diff --git a/graphics/weather/drought/0.gbapal b/graphics/weather/drought/colors_0.bin similarity index 100% rename from graphics/weather/drought/0.gbapal rename to graphics/weather/drought/colors_0.bin diff --git a/graphics/weather/drought/1.gbapal b/graphics/weather/drought/colors_1.bin similarity index 100% rename from graphics/weather/drought/1.gbapal rename to graphics/weather/drought/colors_1.bin diff --git a/graphics/weather/drought/2.gbapal b/graphics/weather/drought/colors_2.bin similarity index 100% rename from graphics/weather/drought/2.gbapal rename to graphics/weather/drought/colors_2.bin diff --git a/graphics/weather/drought/3.gbapal b/graphics/weather/drought/colors_3.bin similarity index 100% rename from graphics/weather/drought/3.gbapal rename to graphics/weather/drought/colors_3.bin diff --git a/graphics/weather/drought/4.gbapal b/graphics/weather/drought/colors_4.bin similarity index 100% rename from graphics/weather/drought/4.gbapal rename to graphics/weather/drought/colors_4.bin diff --git a/graphics/weather/drought/5.gbapal b/graphics/weather/drought/colors_5.bin similarity index 100% rename from graphics/weather/drought/5.gbapal rename to graphics/weather/drought/colors_5.bin diff --git a/src/field_weather.c b/src/field_weather.c index 21168426ca..0db635c604 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -73,12 +73,12 @@ IWRAM_DATA static const u8 *sPaletteGammaTypes; // The drought weather effect uses a precalculated color lookup table. Presumably this // is because the underlying color shift calculation is slow. const u16 sDroughtWeatherColors[][0x1000] = { - INCBIN_U16("graphics/weather/drought/0.gbapal"), - INCBIN_U16("graphics/weather/drought/1.gbapal"), - INCBIN_U16("graphics/weather/drought/2.gbapal"), - INCBIN_U16("graphics/weather/drought/3.gbapal"), - INCBIN_U16("graphics/weather/drought/4.gbapal"), - INCBIN_U16("graphics/weather/drought/5.gbapal"), + INCBIN_U16("graphics/weather/drought/colors_0.bin"), + INCBIN_U16("graphics/weather/drought/colors_1.bin"), + INCBIN_U16("graphics/weather/drought/colors_2.bin"), + INCBIN_U16("graphics/weather/drought/colors_3.bin"), + INCBIN_U16("graphics/weather/drought/colors_4.bin"), + INCBIN_U16("graphics/weather/drought/colors_5.bin"), }; // This is a pointer to gWeather. All code in this file accesses gWeather directly, From e43f341799ddc5f298b7e3c2e029b73e519fc003 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 13:29:33 -0600 Subject: [PATCH 17/42] Cleanup link contest map scripts --- data/event_scripts.s | 10 +- data/maps/LinkContestRoom1/scripts.inc | 457 +++++++++++++++++++++++++ data/maps/LinkContestRoom2/events.inc | 1 + data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom2/scripts.inc | 2 +- data/maps/LinkContestRoom3/events.inc | 1 + data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom3/scripts.inc | 2 +- data/maps/LinkContestRoom4/events.inc | 1 + data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom4/scripts.inc | 2 +- data/maps/LinkContestRoom5/events.inc | 1 + data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom5/scripts.inc | 2 +- data/maps/LinkContestRoom6/events.inc | 1 + data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LinkContestRoom6/scripts.inc | 2 +- data/maps/UnknownMap_25_29/events.inc | 1 + data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_29/scripts.inc | 2 +- data/maps/UnknownMap_25_30/events.inc | 1 + data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_30/scripts.inc | 2 +- data/maps/UnknownMap_25_31/events.inc | 1 + data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_31/scripts.inc | 2 +- data/maps/UnknownMap_25_32/events.inc | 1 + data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_32/scripts.inc | 2 +- data/maps/UnknownMap_25_33/events.inc | 1 + data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_33/scripts.inc | 2 +- data/maps/UnknownMap_25_34/events.inc | 1 + data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/UnknownMap_25_34/scripts.inc | 457 ------------------------- 35 files changed, 494 insertions(+), 483 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 3877d6183c..438bdb7f3e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -639,17 +639,17 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/RecordCorner/scripts.inc" .include "data/maps/DoubleBattleColosseum/scripts.inc" .include "data/maps/LinkContestRoom1/scripts.inc" - .include "data/maps/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/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/InsideOfTruck/scripts.inc" .include "data/maps/SSTidalCorridor/scripts.inc" .include "data/maps/SSTidalLowerDeck/scripts.inc" diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index 5276adcd85..e756c2bc6d 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1 +1,458 @@ LinkContestRoom1_MapScripts:: @ 823B781 + map_script 4, LinkContestRoom1_MapScript2_23B81F + map_script 2, LinkContestRoom1_MapScript2_23B815 + map_script 3, LinkContestRoom1_MapScript1_23B79F + map_script 5, LinkContestRoom1_MapScript1_23B803 + map_script 7, LinkContestRoom1_MapScript1_23B79B + .byte 0 + +LinkContestRoom1_MapScript1_23B79B: @ 823B79B + special sub_80F8B94 + end + +LinkContestRoom1_MapScript1_23B79F: @ 823B79F + call LinkContestRoom1_EventScript_23B7AF + setvar VAR_TEMP_0, 1 + call LinkContestRoom1_EventScript_23B842 + end + +LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF + call LinkContestRoom1_EventScript_27A133 + special ScriptGetMultiplayerId + compare VAR_RESULT, 0 + call_if_eq LinkContestRoom1_EventScript_23B7EF + compare VAR_RESULT, 1 + call_if_eq LinkContestRoom1_EventScript_23B7F3 + compare VAR_RESULT, 2 + call_if_eq LinkContestRoom1_EventScript_23B7F7 + compare VAR_RESULT, 3 + call_if_eq LinkContestRoom1_EventScript_23B7FB + compare VAR_RESULT, 4 + call_if_eq LinkContestRoom1_EventScript_23B7FF + return + +LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF + savebgm MUS_TEST1 + return + +LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 + savebgm MUS_TEST2 + return + +LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 + savebgm MUS_TEST3 + return + +LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB + savebgm MUS_TEST4 + return + +LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF + savebgm MUS_CONTEST0 + return + +LinkContestRoom1_MapScript1_23B803: @ 823B803 + compare VAR_TEMP_9, 1 + call_if_eq LinkContestRoom1_EventScript_23B80F + end + +LinkContestRoom1_EventScript_23B80F:: @ 823B80F + call LinkContestRoom1_EventScript_23BB2B + return + +LinkContestRoom1_MapScript2_23B815: @ 823B815 + map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 + .2byte 0 + +LinkContestRoom1_MapScript2_23B81F: @ 823B81F + map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 + .2byte 0 + +LinkContestRoom1_EventScript_23B829:: @ 823B829 + call LinkContestRoom1_EventScript_279F97 + call LinkContestRoom1_EventScript_23BE44 + end + +LinkContestRoom1_EventScript_23B834:: @ 823B834 + special sub_80F8B94 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + call LinkContestRoom1_EventScript_23BB2B + end + +LinkContestRoom1_EventScript_23B842:: @ 823B842 + call LinkContestRoom1_EventScript_23B8F8 + call LinkContestRoom1_EventScript_23B858 + compare VAR_TEMP_0, 8 + goto_if_lt LinkContestRoom1_EventScript_23B842 + return + +LinkContestRoom1_EventScript_23B858:: @ 823B858 + switch VAR_TEMP_0 + case 1, LinkContestRoom1_EventScript_23B8AB + case 2, LinkContestRoom1_EventScript_23B8B6 + case 3, LinkContestRoom1_EventScript_23B8C1 + case 4, LinkContestRoom1_EventScript_23B8CC + case 5, LinkContestRoom1_EventScript_23B8D7 + case 6, LinkContestRoom1_EventScript_23B8E2 + case 7, LinkContestRoom1_EventScript_23B8ED + end + +LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 + setvar VAR_RESULT, 32 + special ScriptRandom + addvar VAR_RESULT, 1 + switch VAR_RESULT + case 1, LinkContestRoom1_EventScript_23BA6B + case 2, LinkContestRoom1_EventScript_23BA71 + case 3, LinkContestRoom1_EventScript_23BA77 + case 4, LinkContestRoom1_EventScript_23BA7D + case 5, LinkContestRoom1_EventScript_23BA83 + case 6, LinkContestRoom1_EventScript_23BA89 + case 7, LinkContestRoom1_EventScript_23BA8F + case 8, LinkContestRoom1_EventScript_23BA95 + case 9, LinkContestRoom1_EventScript_23BA9B + case 10, LinkContestRoom1_EventScript_23BAA1 + case 11, LinkContestRoom1_EventScript_23BAA7 + case 12, LinkContestRoom1_EventScript_23BAAD + case 13, LinkContestRoom1_EventScript_23BAB3 + case 14, LinkContestRoom1_EventScript_23BAB9 + case 15, LinkContestRoom1_EventScript_23BABF + case 16, LinkContestRoom1_EventScript_23BAC5 + case 17, LinkContestRoom1_EventScript_23BACB + case 18, LinkContestRoom1_EventScript_23BAD1 + case 19, LinkContestRoom1_EventScript_23BAD7 + case 20, LinkContestRoom1_EventScript_23BADD + case 21, LinkContestRoom1_EventScript_23BAE3 + case 22, LinkContestRoom1_EventScript_23BAE9 + case 23, LinkContestRoom1_EventScript_23BAEF + case 24, LinkContestRoom1_EventScript_23BAF5 + case 25, LinkContestRoom1_EventScript_23BAFB + case 26, LinkContestRoom1_EventScript_23BB01 + case 27, LinkContestRoom1_EventScript_23BB07 + case 28, LinkContestRoom1_EventScript_23BB0D + case 29, LinkContestRoom1_EventScript_23BB13 + case 30, LinkContestRoom1_EventScript_23BB19 + case 31, LinkContestRoom1_EventScript_23BB1F + case 32, LinkContestRoom1_EventScript_23BB25 + end + +LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B + setvar VAR_TEMP_1, 5 + return + +LinkContestRoom1_EventScript_23BA71:: @ 823BA71 + setvar VAR_TEMP_1, 6 + return + +LinkContestRoom1_EventScript_23BA77:: @ 823BA77 + setvar VAR_TEMP_1, 7 + return + +LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D + setvar VAR_TEMP_1, 8 + return + +LinkContestRoom1_EventScript_23BA83:: @ 823BA83 + setvar VAR_TEMP_1, 10 + return + +LinkContestRoom1_EventScript_23BA89:: @ 823BA89 + setvar VAR_TEMP_1, 11 + return + +LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F + setvar VAR_TEMP_1, 12 + return + +LinkContestRoom1_EventScript_23BA95:: @ 823BA95 + setvar VAR_TEMP_1, 13 + return + +LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B + setvar VAR_TEMP_1, 14 + return + +LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 + setvar VAR_TEMP_1, 15 + return + +LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 + setvar VAR_TEMP_1, 17 + return + +LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD + setvar VAR_TEMP_1, 18 + return + +LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 + setvar VAR_TEMP_1, 19 + return + +LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 + setvar VAR_TEMP_1, 20 + return + +LinkContestRoom1_EventScript_23BABF:: @ 823BABF + setvar VAR_TEMP_1, 21 + return + +LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 + setvar VAR_TEMP_1, 22 + return + +LinkContestRoom1_EventScript_23BACB:: @ 823BACB + setvar VAR_TEMP_1, 25 + return + +LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 + setvar VAR_TEMP_1, 26 + return + +LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 + setvar VAR_TEMP_1, 27 + return + +LinkContestRoom1_EventScript_23BADD:: @ 823BADD + setvar VAR_TEMP_1, 47 + return + +LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 + setvar VAR_TEMP_1, 30 + return + +LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 + setvar VAR_TEMP_1, 31 + return + +LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF + setvar VAR_TEMP_1, 32 + return + +LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 + setvar VAR_TEMP_1, 33 + return + +LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB + setvar VAR_TEMP_1, 34 + return + +LinkContestRoom1_EventScript_23BB01:: @ 823BB01 + setvar VAR_TEMP_1, 35 + return + +LinkContestRoom1_EventScript_23BB07:: @ 823BB07 + setvar VAR_TEMP_1, 36 + return + +LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D + setvar VAR_TEMP_1, 37 + return + +LinkContestRoom1_EventScript_23BB13:: @ 823BB13 + setvar VAR_TEMP_1, 38 + return + +LinkContestRoom1_EventScript_23BB19:: @ 823BB19 + setvar VAR_TEMP_1, 44 + return + +LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F + setvar VAR_TEMP_1, 45 + return + +LinkContestRoom1_EventScript_23BB25:: @ 823BB25 + setvar VAR_TEMP_1, 46 + return + +LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B + specialvar VAR_RESULT, sub_80F9160 + compare VAR_RESULT, 1 + goto_if_eq LinkContestRoom1_EventScript_23BD86 + switch VAR_0x4088 + case 1, LinkContestRoom1_EventScript_23BB78 + case 2, LinkContestRoom1_EventScript_23BB8B + case 3, LinkContestRoom1_EventScript_23BBE6 + case 4, LinkContestRoom1_EventScript_23BC92 + case 5, LinkContestRoom1_EventScript_23BC92 + return + +LinkContestRoom1_EventScript_23BB78:: @ 823BB78 + createvobject 5, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 46, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 12, 13, 12, 8, 3, 3 + createvobject 47, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 48, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 22, 20, 3, 2, 3, 1 + createvobject 23, 20, 6, 2, 3, 1 + createvobject 34, 20, 7, 2, 3, 1 + createvobject 46, 24, 8, 2, 3, 1 + createvobject 48, 24, 11, 2, 3, 1 + createvobject 11, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 17, 27, 5, 9, 3, 2 + createvobject 40, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_23BC92:: @ 823BC92 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + createvobject 49, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 48, 27, 5, 9, 3, 2 + createvobject 40, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_23BD86:: @ 823BD86 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BE44:: @ 823BE44 + special sub_80F9154 + switch VAR_0x4088 + case 1, LinkContestRoom1_EventScript_23BE84 + case 2, LinkContestRoom1_EventScript_23BE8E + case 3, LinkContestRoom1_EventScript_23BE98 + case 4, LinkContestRoom1_EventScript_23BEA2 + case 5, LinkContestRoom1_EventScript_23BEAC + return + +LinkContestRoom1_EventScript_23BE84:: @ 823BE84 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BE98:: @ 823BE98 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 + waitstate + end + +LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE + compare VAR_RESULT, FEMALE + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 + return + +LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return + diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/LinkContestRoom2/events.inc +++ b/data/maps/LinkContestRoom2/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 406b8e5c33..e37d65f86f 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,7 +1,7 @@ LinkContestRoom2: @ 8484E64 .4byte LinkContestRoom2_Layout .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom2_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 232 diff --git a/data/maps/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc index ff85310f75..8b13789179 100644 --- a/data/maps/LinkContestRoom2/scripts.inc +++ b/data/maps/LinkContestRoom2/scripts.inc @@ -1 +1 @@ -LinkContestRoom2_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/LinkContestRoom3/events.inc +++ b/data/maps/LinkContestRoom3/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 1f5de7cf06..90333ebd98 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,7 +1,7 @@ LinkContestRoom3: @ 8484E80 .4byte LinkContestRoom3_Layout .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom3_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 233 diff --git a/data/maps/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc index c3a5c95fb0..8b13789179 100644 --- a/data/maps/LinkContestRoom3/scripts.inc +++ b/data/maps/LinkContestRoom3/scripts.inc @@ -1 +1 @@ -LinkContestRoom3_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/LinkContestRoom4/events.inc +++ b/data/maps/LinkContestRoom4/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 84dc7829b5..781ebed0f9 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,7 +1,7 @@ LinkContestRoom4: @ 8484E9C .4byte LinkContestRoom4_Layout .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom4_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 234 diff --git a/data/maps/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc index 9a544e6f3d..8b13789179 100644 --- a/data/maps/LinkContestRoom4/scripts.inc +++ b/data/maps/LinkContestRoom4/scripts.inc @@ -1 +1 @@ -LinkContestRoom4_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/LinkContestRoom5/events.inc +++ b/data/maps/LinkContestRoom5/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index c6f64fdc77..87253d0d6b 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,7 +1,7 @@ LinkContestRoom5: @ 8484EB8 .4byte LinkContestRoom5_Layout .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom5_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 235 diff --git a/data/maps/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc index f7ea729963..8b13789179 100644 --- a/data/maps/LinkContestRoom5/scripts.inc +++ b/data/maps/LinkContestRoom5/scripts.inc @@ -1 +1 @@ -LinkContestRoom5_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/LinkContestRoom6/events.inc +++ b/data/maps/LinkContestRoom6/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 5e4c09fbe5..ade67e7e71 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,7 +1,7 @@ LinkContestRoom6: @ 8484ED4 .4byte LinkContestRoom6_Layout .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom6_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 236 diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc index bea65ea48f..8b13789179 100644 --- a/data/maps/LinkContestRoom6/scripts.inc +++ b/data/maps/LinkContestRoom6/scripts.inc @@ -1 +1 @@ -LinkContestRoom6_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/UnknownMap_25_29/events.inc +++ b/data/maps/UnknownMap_25_29/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index c056dd072f..aa4ffc0cdc 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_29: @ 8484DBC .4byte UnknownMap_25_29_Layout .4byte LinkContestRoom1_MapEvents - .4byte UnknownMap_25_29_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 226 diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownMap_25_29/scripts.inc index 575e7a8984..8b13789179 100644 --- a/data/maps/UnknownMap_25_29/scripts.inc +++ b/data/maps/UnknownMap_25_29/scripts.inc @@ -1 +1 @@ -UnknownMap_25_29_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/UnknownMap_25_30/events.inc +++ b/data/maps/UnknownMap_25_30/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 652fc466f5..86e2d4f704 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_30: @ 8484DD8 .4byte UnknownMap_25_30_Layout .4byte LinkContestRoom1_MapEvents - .4byte UnknownMap_25_30_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 227 diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownMap_25_30/scripts.inc index dbc73166d6..8b13789179 100644 --- a/data/maps/UnknownMap_25_30/scripts.inc +++ b/data/maps/UnknownMap_25_30/scripts.inc @@ -1 +1 @@ -UnknownMap_25_30_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/UnknownMap_25_31/events.inc +++ b/data/maps/UnknownMap_25_31/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index d90c49d684..78ede2d656 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_31: @ 8484DF4 .4byte UnknownMap_25_31_Layout .4byte LinkContestRoom1_MapEvents - .4byte UnknownMap_25_31_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 228 diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownMap_25_31/scripts.inc index cacda4d1f8..8b13789179 100644 --- a/data/maps/UnknownMap_25_31/scripts.inc +++ b/data/maps/UnknownMap_25_31/scripts.inc @@ -1 +1 @@ -UnknownMap_25_31_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/UnknownMap_25_32/events.inc +++ b/data/maps/UnknownMap_25_32/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 100aaca195..8265281193 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_32: @ 8484E10 .4byte UnknownMap_25_32_Layout .4byte LinkContestRoom1_MapEvents - .4byte UnknownMap_25_32_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 229 diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownMap_25_32/scripts.inc index e34f454e71..8b13789179 100644 --- a/data/maps/UnknownMap_25_32/scripts.inc +++ b/data/maps/UnknownMap_25_32/scripts.inc @@ -1 +1 @@ -UnknownMap_25_32_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/UnknownMap_25_33/events.inc +++ b/data/maps/UnknownMap_25_33/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 31670d1ad8..99502bb0fe 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_33: @ 8484E2C .4byte UnknownMap_25_33_Layout .4byte LinkContestRoom1_MapEvents - .4byte UnknownMap_25_33_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 230 diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownMap_25_33/scripts.inc index 086d2d32c6..8b13789179 100644 --- a/data/maps/UnknownMap_25_33/scripts.inc +++ b/data/maps/UnknownMap_25_33/scripts.inc @@ -1 +1 @@ -UnknownMap_25_33_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc index e69de29bb2..8b13789179 100644 --- a/data/maps/UnknownMap_25_34/events.inc +++ b/data/maps/UnknownMap_25_34/events.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 6bad2af809..6e95a82224 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_34: @ 8484E48 .4byte UnknownMap_25_34_Layout .4byte LinkContestRoom1_MapEvents - .4byte UnknownMap_25_34_MapScripts + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 231 diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index fe88972dfe..8b13789179 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -1,458 +1 @@ -UnknownMap_25_34_MapScripts:: @ 823B781 - map_script 4, LinkContestRoom1_MapScript2_23B81F - map_script 2, LinkContestRoom1_MapScript2_23B815 - map_script 3, LinkContestRoom1_MapScript1_23B79F - map_script 5, LinkContestRoom1_MapScript1_23B803 - map_script 7, LinkContestRoom1_MapScript1_23B79B - .byte 0 - -LinkContestRoom1_MapScript1_23B79B: @ 823B79B - special sub_80F8B94 - end - -LinkContestRoom1_MapScript1_23B79F: @ 823B79F - call LinkContestRoom1_EventScript_23B7AF - setvar VAR_TEMP_0, 1 - call LinkContestRoom1_EventScript_23B842 - end - -LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF - call LinkContestRoom1_EventScript_27A133 - special ScriptGetMultiplayerId - compare VAR_RESULT, 0 - call_if_eq LinkContestRoom1_EventScript_23B7EF - compare VAR_RESULT, 1 - call_if_eq LinkContestRoom1_EventScript_23B7F3 - compare VAR_RESULT, 2 - call_if_eq LinkContestRoom1_EventScript_23B7F7 - compare VAR_RESULT, 3 - call_if_eq LinkContestRoom1_EventScript_23B7FB - compare VAR_RESULT, 4 - call_if_eq LinkContestRoom1_EventScript_23B7FF - return - -LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF - savebgm MUS_TEST1 - return - -LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 - savebgm MUS_TEST2 - return - -LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 - savebgm MUS_TEST3 - return - -LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB - savebgm MUS_TEST4 - return - -LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF - savebgm MUS_CONTEST0 - return - -LinkContestRoom1_MapScript1_23B803: @ 823B803 - compare VAR_TEMP_9, 1 - call_if_eq LinkContestRoom1_EventScript_23B80F - end - -LinkContestRoom1_EventScript_23B80F:: @ 823B80F - call LinkContestRoom1_EventScript_23BB2B - return - -LinkContestRoom1_MapScript2_23B815: @ 823B815 - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 - .2byte 0 - -LinkContestRoom1_MapScript2_23B81F: @ 823B81F - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 - .2byte 0 - -LinkContestRoom1_EventScript_23B829:: @ 823B829 - call LinkContestRoom1_EventScript_279F97 - call LinkContestRoom1_EventScript_23BE44 - end - -LinkContestRoom1_EventScript_23B834:: @ 823B834 - special sub_80F8B94 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN - call LinkContestRoom1_EventScript_23BB2B - end - -LinkContestRoom1_EventScript_23B842:: @ 823B842 - call LinkContestRoom1_EventScript_23B8F8 - call LinkContestRoom1_EventScript_23B858 - compare VAR_TEMP_0, 8 - goto_if_lt LinkContestRoom1_EventScript_23B842 - return - -LinkContestRoom1_EventScript_23B858:: @ 823B858 - switch VAR_TEMP_0 - case 1, LinkContestRoom1_EventScript_23B8AB - case 2, LinkContestRoom1_EventScript_23B8B6 - case 3, LinkContestRoom1_EventScript_23B8C1 - case 4, LinkContestRoom1_EventScript_23B8CC - case 5, LinkContestRoom1_EventScript_23B8D7 - case 6, LinkContestRoom1_EventScript_23B8E2 - case 7, LinkContestRoom1_EventScript_23B8ED - end - -LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB - copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 - copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 - copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC - copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 - copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 - copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED - copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 - setvar VAR_RESULT, 32 - special ScriptRandom - addvar VAR_RESULT, 1 - switch VAR_RESULT - case 1, LinkContestRoom1_EventScript_23BA6B - case 2, LinkContestRoom1_EventScript_23BA71 - case 3, LinkContestRoom1_EventScript_23BA77 - case 4, LinkContestRoom1_EventScript_23BA7D - case 5, LinkContestRoom1_EventScript_23BA83 - case 6, LinkContestRoom1_EventScript_23BA89 - case 7, LinkContestRoom1_EventScript_23BA8F - case 8, LinkContestRoom1_EventScript_23BA95 - case 9, LinkContestRoom1_EventScript_23BA9B - case 10, LinkContestRoom1_EventScript_23BAA1 - case 11, LinkContestRoom1_EventScript_23BAA7 - case 12, LinkContestRoom1_EventScript_23BAAD - case 13, LinkContestRoom1_EventScript_23BAB3 - case 14, LinkContestRoom1_EventScript_23BAB9 - case 15, LinkContestRoom1_EventScript_23BABF - case 16, LinkContestRoom1_EventScript_23BAC5 - case 17, LinkContestRoom1_EventScript_23BACB - case 18, LinkContestRoom1_EventScript_23BAD1 - case 19, LinkContestRoom1_EventScript_23BAD7 - case 20, LinkContestRoom1_EventScript_23BADD - case 21, LinkContestRoom1_EventScript_23BAE3 - case 22, LinkContestRoom1_EventScript_23BAE9 - case 23, LinkContestRoom1_EventScript_23BAEF - case 24, LinkContestRoom1_EventScript_23BAF5 - case 25, LinkContestRoom1_EventScript_23BAFB - case 26, LinkContestRoom1_EventScript_23BB01 - case 27, LinkContestRoom1_EventScript_23BB07 - case 28, LinkContestRoom1_EventScript_23BB0D - case 29, LinkContestRoom1_EventScript_23BB13 - case 30, LinkContestRoom1_EventScript_23BB19 - case 31, LinkContestRoom1_EventScript_23BB1F - case 32, LinkContestRoom1_EventScript_23BB25 - end - -LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B - setvar VAR_TEMP_1, 5 - return - -LinkContestRoom1_EventScript_23BA71:: @ 823BA71 - setvar VAR_TEMP_1, 6 - return - -LinkContestRoom1_EventScript_23BA77:: @ 823BA77 - setvar VAR_TEMP_1, 7 - return - -LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D - setvar VAR_TEMP_1, 8 - return - -LinkContestRoom1_EventScript_23BA83:: @ 823BA83 - setvar VAR_TEMP_1, 10 - return - -LinkContestRoom1_EventScript_23BA89:: @ 823BA89 - setvar VAR_TEMP_1, 11 - return - -LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F - setvar VAR_TEMP_1, 12 - return - -LinkContestRoom1_EventScript_23BA95:: @ 823BA95 - setvar VAR_TEMP_1, 13 - return - -LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B - setvar VAR_TEMP_1, 14 - return - -LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 - setvar VAR_TEMP_1, 15 - return - -LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 - setvar VAR_TEMP_1, 17 - return - -LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD - setvar VAR_TEMP_1, 18 - return - -LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 - setvar VAR_TEMP_1, 19 - return - -LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 - setvar VAR_TEMP_1, 20 - return - -LinkContestRoom1_EventScript_23BABF:: @ 823BABF - setvar VAR_TEMP_1, 21 - return - -LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 - setvar VAR_TEMP_1, 22 - return - -LinkContestRoom1_EventScript_23BACB:: @ 823BACB - setvar VAR_TEMP_1, 25 - return - -LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 - setvar VAR_TEMP_1, 26 - return - -LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 - setvar VAR_TEMP_1, 27 - return - -LinkContestRoom1_EventScript_23BADD:: @ 823BADD - setvar VAR_TEMP_1, 47 - return - -LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 - setvar VAR_TEMP_1, 30 - return - -LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 - setvar VAR_TEMP_1, 31 - return - -LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF - setvar VAR_TEMP_1, 32 - return - -LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 - setvar VAR_TEMP_1, 33 - return - -LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB - setvar VAR_TEMP_1, 34 - return - -LinkContestRoom1_EventScript_23BB01:: @ 823BB01 - setvar VAR_TEMP_1, 35 - return - -LinkContestRoom1_EventScript_23BB07:: @ 823BB07 - setvar VAR_TEMP_1, 36 - return - -LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D - setvar VAR_TEMP_1, 37 - return - -LinkContestRoom1_EventScript_23BB13:: @ 823BB13 - setvar VAR_TEMP_1, 38 - return - -LinkContestRoom1_EventScript_23BB19:: @ 823BB19 - setvar VAR_TEMP_1, 44 - return - -LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F - setvar VAR_TEMP_1, 45 - return - -LinkContestRoom1_EventScript_23BB25:: @ 823BB25 - setvar VAR_TEMP_1, 46 - return - -LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_23BD86 - switch VAR_0x4088 - case 1, LinkContestRoom1_EventScript_23BB78 - case 2, LinkContestRoom1_EventScript_23BB8B - case 3, LinkContestRoom1_EventScript_23BBE6 - case 4, LinkContestRoom1_EventScript_23BC92 - case 5, LinkContestRoom1_EventScript_23BC92 - return - -LinkContestRoom1_EventScript_23BB78:: @ 823BB78 - createvobject 5, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 46, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 12, 13, 12, 8, 3, 3 - createvobject 47, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 48, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 22, 20, 3, 2, 3, 1 - createvobject 23, 20, 6, 2, 3, 1 - createvobject 34, 20, 7, 2, 3, 1 - createvobject 46, 24, 8, 2, 3, 1 - createvobject 48, 24, 11, 2, 3, 1 - createvobject 11, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 17, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 - return - -LinkContestRoom1_EventScript_23BC92:: @ 823BC92 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - createvobject 49, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 48, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 - return - -LinkContestRoom1_EventScript_23BD86:: @ 823BD86 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BE44:: @ 823BE44 - special sub_80F9154 - switch VAR_0x4088 - case 1, LinkContestRoom1_EventScript_23BE84 - case 2, LinkContestRoom1_EventScript_23BE8E - case 3, LinkContestRoom1_EventScript_23BE98 - case 4, LinkContestRoom1_EventScript_23BEA2 - case 5, LinkContestRoom1_EventScript_23BEAC - return - -LinkContestRoom1_EventScript_23BE84:: @ 823BE84 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE98:: @ 823BE98 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 - waitstate - end - -LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 - checkplayergender - compare VAR_RESULT, MALE - goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE - compare VAR_RESULT, FEMALE - goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 - return - -LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - return - -LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - return From bd667102fafbace31694447190f5dd79b016834e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 13:36:55 -0600 Subject: [PATCH 18/42] Fix PetaburgCity map scripts label --- data/event_scripts.s | 4 ---- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity/scripts.inc | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 438bdb7f3e..3c3c38eb9b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -61,11 +61,7 @@ gStdScripts:: @ 81DC2A0 .4byte Std_RegisteredInMatchCall .4byte Std_9 .4byte Std_10 - gStdScripts_End:: @ 81DC2CC - map_script 3, PetalburgCity_MapScript1_1DC2D7 - map_script 2, PetalburgCity_MapScript2_1DC31C - .byte 0 .include "data/maps/PetalburgCity/scripts.inc" .include "data/maps/SlateportCity/scripts.inc" diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 6a4f82bfa2..5cf3cc6e15 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,7 +1,7 @@ PetalburgCity: @ 84824B8 .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents - .4byte gStdScripts_End + .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 137731ae21..f69eb3a3a1 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,3 +1,8 @@ +PetalburgCity_MapScripts:: + map_script 3, PetalburgCity_MapScript1_1DC2D7 + map_script 2, PetalburgCity_MapScript2_1DC31C + .byte 0 + PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_0x4057, 0 From 14641e916e94cfce9f70f9a16843a8e4a31b065f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 13:56:06 -0600 Subject: [PATCH 19/42] Cleanup Rustboro City House layout label --- data/layouts/RustboroCity_House/layout.inc | 2 +- data/layouts_table.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc index b1b90daee9..0c8a2075e5 100644 --- a/data/layouts/RustboroCity_House/layout.inc +++ b/data/layouts/RustboroCity_House/layout.inc @@ -5,7 +5,7 @@ RustboroCity_House_MapBlockdata:: .incbin "data/layouts/RustboroCity_House/map.bin" .align 2 -RustboroCity_House_Layouts:: +RustboroCity_House_Layout:: .4byte 0xc .4byte 0x9 .4byte RustboroCity_House_MapBorder diff --git a/data/layouts_table.inc b/data/layouts_table.inc index ab55784383..fb1385bdb6 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -95,7 +95,7 @@ gMapLayouts:: .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_Gym_Layout .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_House_Layouts + .4byte RustboroCity_House_Layout .4byte RustboroCity_House1_Layout .4byte RustboroCity_CuttersHouse_Layout .4byte FortreeCity_House1_Layout diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 1de4f0e368..d842f2e794 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,5 +1,5 @@ RustboroCity_House2: @ 8483494 - .4byte RustboroCity_House_Layouts + .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index c1a0312e37..7f057cf156 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,5 +1,5 @@ RustboroCity_House3: @ 8483504 - .4byte RustboroCity_House_Layouts + .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 From d46e60765d4dca8e160368949fad5376af82fa71 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 29 Jan 2019 22:22:02 +0100 Subject: [PATCH 20/42] Rename a palace battle field --- include/battle.h | 6 +++--- src/battle_gfx_sfx_util.c | 4 ++-- src/battle_main.c | 2 +- src/battle_util.c | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/battle.h b/include/battle.h index 0ed09caada..9295a35481 100644 --- a/include/battle.h +++ b/include/battle.h @@ -168,7 +168,7 @@ struct ProtectStruct u32 helpingHand:1; u32 bounceMove:1; u32 stealMove:1; - u32 flag0Unknown:1; + u32 flag0Unknown:1; // Only set to 0 once. u32 prlzImmobility:1; u32 confusionSelfDmg:1; u32 targetNotAffected:1; @@ -178,10 +178,10 @@ struct ProtectStruct u32 loveImmobility:1; u32 usedDisabledMove:1; u32 usedTauntedMove:1; - u32 flag2Unknown:1; + u32 flag2Unknown:1; // Only set to 0 once. Checked in 'WasUnableToUseMove' function. u32 flinchImmobility:1; u32 notFirstStrike:1; - u32 palaceAbleToUseMove:1; + u32 palaceUnableToUseMove:1; u32 physicalDmg; u32 specialDmg; u8 physicalBattlerId; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 089d095582..7c6b743042 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -205,13 +205,13 @@ u16 ChooseMoveAndTargetInBattlePalace(void) if (Random() % 100 > 49) { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; return 0; } } else { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; return 0; } } diff --git a/src/battle_main.c b/src/battle_main.c index 6d04103e54..09ea3dfc9a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5492,7 +5492,7 @@ static void HandleAction_UseMove(void) // choose battlescript if (gBattleTypeFlags & BATTLE_TYPE_PALACE - && gProtectStructs[gBattlerAttacker].palaceAbleToUseMove) + && gProtectStructs[gBattlerAttacker].palaceUnableToUseMove) { if (gBattleMons[gBattlerAttacker].hp == 0) { diff --git a/src/battle_util.c b/src/battle_util.c index 04659571ed..2f583a9c7e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -321,7 +321,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -336,7 +336,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -351,7 +351,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -366,7 +366,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -388,7 +388,7 @@ u8 TrySetCantSelectMoveBattleScript(void) gLastUsedItem = gBattleMons[gActiveBattler].item; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -401,7 +401,7 @@ u8 TrySetCantSelectMoveBattleScript(void) { if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { From 5c1667b41a7d31df6d405d272833895bf8472cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 16:55:25 -0600 Subject: [PATCH 21/42] Define layout constants --- data/maps.s | 1 + .../AbandonedShip_CaptainsOffice/events.inc | 6 +- .../AbandonedShip_CaptainsOffice/header.inc | 4 +- .../AbandonedShip_Corridors_1F/events.inc | 6 +- .../AbandonedShip_Corridors_1F/header.inc | 4 +- .../AbandonedShip_Corridors_B1F/events.inc | 8 +- .../AbandonedShip_Corridors_B1F/header.inc | 4 +- data/maps/AbandonedShip_Deck/events.inc | 4 +- data/maps/AbandonedShip_Deck/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../AbandonedShip_HiddenFloorRooms/events.inc | 8 +- .../AbandonedShip_HiddenFloorRooms/header.inc | 4 +- data/maps/AbandonedShip_Room_B1F/events.inc | 6 +- data/maps/AbandonedShip_Room_B1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms2_1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms2_B1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms_1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms_B1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 4 +- .../maps/AbandonedShip_Underwater1/events.inc | 4 +- .../maps/AbandonedShip_Underwater1/header.inc | 4 +- .../maps/AbandonedShip_Underwater2/events.inc | 4 +- .../maps/AbandonedShip_Underwater2/header.inc | 4 +- data/maps/AlteringCave/events.inc | 4 +- data/maps/AlteringCave/header.inc | 4 +- data/maps/AncientTomb/events.inc | 8 +- data/maps/AncientTomb/header.inc | 4 +- data/maps/AquaHideout_1F/events.inc | 6 +- data/maps/AquaHideout_1F/header.inc | 4 +- data/maps/AquaHideout_B1F/events.inc | 6 +- data/maps/AquaHideout_B1F/header.inc | 4 +- data/maps/AquaHideout_B2F/events.inc | 8 +- data/maps/AquaHideout_B2F/header.inc | 4 +- .../AquaHideout_UnusedRubyMap1/events.inc | 2 +- .../AquaHideout_UnusedRubyMap1/header.inc | 4 +- .../AquaHideout_UnusedRubyMap2/events.inc | 2 +- .../AquaHideout_UnusedRubyMap2/header.inc | 4 +- .../AquaHideout_UnusedRubyMap3/events.inc | 2 +- .../AquaHideout_UnusedRubyMap3/header.inc | 4 +- data/maps/ArtisanCave_1F/events.inc | 6 +- data/maps/ArtisanCave_1F/header.inc | 4 +- data/maps/ArtisanCave_B1F/events.inc | 8 +- data/maps/ArtisanCave_B1F/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../BattleFrontier_BattleDomeLobby/events.inc | 8 +- .../BattleFrontier_BattleDomeLobby/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../BattleFrontier_BattlePikeLobby/events.inc | 8 +- .../BattleFrontier_BattlePikeLobby/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- data/maps/BattleFrontier_Lounge1/events.inc | 6 +- data/maps/BattleFrontier_Lounge1/header.inc | 4 +- data/maps/BattleFrontier_Lounge2/events.inc | 6 +- data/maps/BattleFrontier_Lounge2/header.inc | 4 +- data/maps/BattleFrontier_Lounge3/events.inc | 6 +- data/maps/BattleFrontier_Lounge3/header.inc | 4 +- data/maps/BattleFrontier_Lounge4/events.inc | 6 +- data/maps/BattleFrontier_Lounge4/header.inc | 4 +- data/maps/BattleFrontier_Lounge5/events.inc | 6 +- data/maps/BattleFrontier_Lounge5/header.inc | 4 +- data/maps/BattleFrontier_Lounge6/events.inc | 6 +- data/maps/BattleFrontier_Lounge6/header.inc | 4 +- data/maps/BattleFrontier_Lounge7/events.inc | 6 +- data/maps/BattleFrontier_Lounge7/header.inc | 4 +- data/maps/BattleFrontier_Lounge8/events.inc | 6 +- data/maps/BattleFrontier_Lounge8/header.inc | 4 +- data/maps/BattleFrontier_Lounge9/events.inc | 6 +- data/maps/BattleFrontier_Lounge9/header.inc | 4 +- data/maps/BattleFrontier_Mart/events.inc | 6 +- data/maps/BattleFrontier_Mart/header.inc | 4 +- .../connections.inc | 6 +- .../BattleFrontier_OutsideEast/events.inc | 8 +- .../BattleFrontier_OutsideEast/header.inc | 4 +- .../connections.inc | 6 +- .../BattleFrontier_OutsideWest/events.inc | 8 +- .../BattleFrontier_OutsideWest/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../BattleFrontier_RankingHall/events.inc | 8 +- .../BattleFrontier_RankingHall/header.inc | 4 +- .../BattleFrontier_ReceptionGate/events.inc | 6 +- .../BattleFrontier_ReceptionGate/header.inc | 4 +- .../BattleFrontier_ScottsHouse/events.inc | 6 +- .../BattleFrontier_ScottsHouse/header.inc | 4 +- data/maps/BattlePyramidSquare01/events.inc | 4 +- data/maps/BattlePyramidSquare01/header.inc | 4 +- data/maps/BattlePyramidSquare02/events.inc | 4 +- data/maps/BattlePyramidSquare02/header.inc | 4 +- data/maps/BattlePyramidSquare03/events.inc | 4 +- data/maps/BattlePyramidSquare03/header.inc | 4 +- data/maps/BattlePyramidSquare04/events.inc | 4 +- data/maps/BattlePyramidSquare04/header.inc | 4 +- data/maps/BattlePyramidSquare05/events.inc | 4 +- data/maps/BattlePyramidSquare05/header.inc | 4 +- data/maps/BattlePyramidSquare06/events.inc | 4 +- data/maps/BattlePyramidSquare06/header.inc | 4 +- data/maps/BattlePyramidSquare07/events.inc | 4 +- data/maps/BattlePyramidSquare07/header.inc | 4 +- data/maps/BattlePyramidSquare08/events.inc | 4 +- data/maps/BattlePyramidSquare08/header.inc | 4 +- data/maps/BattlePyramidSquare09/events.inc | 4 +- data/maps/BattlePyramidSquare09/header.inc | 4 +- data/maps/BattlePyramidSquare10/events.inc | 4 +- data/maps/BattlePyramidSquare10/header.inc | 4 +- data/maps/BattlePyramidSquare11/events.inc | 4 +- data/maps/BattlePyramidSquare11/header.inc | 4 +- data/maps/BattlePyramidSquare12/events.inc | 4 +- data/maps/BattlePyramidSquare12/header.inc | 4 +- data/maps/BattlePyramidSquare13/events.inc | 4 +- data/maps/BattlePyramidSquare13/header.inc | 4 +- data/maps/BattlePyramidSquare14/events.inc | 4 +- data/maps/BattlePyramidSquare14/header.inc | 4 +- data/maps/BattlePyramidSquare15/events.inc | 4 +- data/maps/BattlePyramidSquare15/header.inc | 4 +- data/maps/BattlePyramidSquare16/events.inc | 4 +- data/maps/BattlePyramidSquare16/header.inc | 4 +- data/maps/BirthIsland_Exterior/events.inc | 6 +- data/maps/BirthIsland_Exterior/header.inc | 4 +- data/maps/BirthIsland_Harbor/events.inc | 6 +- data/maps/BirthIsland_Harbor/header.inc | 4 +- data/maps/CaveOfOrigin_1F/events.inc | 4 +- data/maps/CaveOfOrigin_1F/header.inc | 4 +- data/maps/CaveOfOrigin_B1F/events.inc | 6 +- data/maps/CaveOfOrigin_B1F/header.inc | 4 +- data/maps/CaveOfOrigin_Entrance/events.inc | 4 +- data/maps/CaveOfOrigin_Entrance/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- data/maps/DesertRuins/events.inc | 8 +- data/maps/DesertRuins/header.inc | 4 +- data/maps/DesertUnderpass/events.inc | 6 +- data/maps/DesertUnderpass/header.inc | 4 +- data/maps/DewfordTown/connections.inc | 6 +- data/maps/DewfordTown/events.inc | 8 +- data/maps/DewfordTown/header.inc | 4 +- data/maps/DewfordTown_Gym/events.inc | 8 +- data/maps/DewfordTown_Gym/header.inc | 4 +- data/maps/DewfordTown_Hall/events.inc | 8 +- data/maps/DewfordTown_Hall/header.inc | 4 +- data/maps/DewfordTown_House1/events.inc | 6 +- data/maps/DewfordTown_House1/header.inc | 4 +- data/maps/DewfordTown_House2/events.inc | 6 +- data/maps/DewfordTown_House2/header.inc | 4 +- .../DewfordTown_PokemonCenter_1F/events.inc | 6 +- .../DewfordTown_PokemonCenter_1F/header.inc | 4 +- .../DewfordTown_PokemonCenter_2F/events.inc | 6 +- .../DewfordTown_PokemonCenter_2F/header.inc | 4 +- data/maps/DoubleBattleColosseum/events.inc | 6 +- data/maps/DoubleBattleColosseum/header.inc | 4 +- data/maps/EverGrandeCity/connections.inc | 6 +- data/maps/EverGrandeCity/events.inc | 8 +- data/maps/EverGrandeCity/header.inc | 4 +- .../EverGrandeCity_ChampionsRoom/events.inc | 6 +- .../EverGrandeCity_ChampionsRoom/header.inc | 4 +- .../maps/EverGrandeCity_DrakesRoom/events.inc | 6 +- .../maps/EverGrandeCity_DrakesRoom/header.inc | 4 +- .../EverGrandeCity_GlaciasRoom/events.inc | 6 +- .../EverGrandeCity_GlaciasRoom/header.inc | 4 +- data/maps/EverGrandeCity_Hall1/events.inc | 4 +- data/maps/EverGrandeCity_Hall1/header.inc | 4 +- data/maps/EverGrandeCity_Hall2/events.inc | 4 +- data/maps/EverGrandeCity_Hall2/header.inc | 4 +- data/maps/EverGrandeCity_Hall3/events.inc | 4 +- data/maps/EverGrandeCity_Hall3/header.inc | 4 +- data/maps/EverGrandeCity_Hall4/events.inc | 4 +- data/maps/EverGrandeCity_Hall4/header.inc | 4 +- data/maps/EverGrandeCity_Hall5/events.inc | 4 +- data/maps/EverGrandeCity_Hall5/header.inc | 4 +- .../maps/EverGrandeCity_HallOfFame/events.inc | 6 +- .../maps/EverGrandeCity_HallOfFame/header.inc | 4 +- .../EverGrandeCity_PhoebesRoom/events.inc | 6 +- .../EverGrandeCity_PhoebesRoom/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../EverGrandeCity_SidneysRoom/events.inc | 6 +- .../EverGrandeCity_SidneysRoom/header.inc | 4 +- data/maps/FallarborTown/connections.inc | 6 +- data/maps/FallarborTown/events.inc | 8 +- data/maps/FallarborTown/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../FallarborTown_BattleTentLobby/events.inc | 8 +- .../FallarborTown_BattleTentLobby/header.inc | 4 +- data/maps/FallarborTown_House1/events.inc | 6 +- data/maps/FallarborTown_House1/header.inc | 4 +- data/maps/FallarborTown_House2/events.inc | 6 +- data/maps/FallarborTown_House2/header.inc | 4 +- data/maps/FallarborTown_Mart/events.inc | 6 +- data/maps/FallarborTown_Mart/header.inc | 4 +- .../FallarborTown_PokemonCenter_1F/events.inc | 6 +- .../FallarborTown_PokemonCenter_1F/header.inc | 4 +- .../FallarborTown_PokemonCenter_2F/events.inc | 6 +- .../FallarborTown_PokemonCenter_2F/header.inc | 4 +- data/maps/FarawayIsland_Entrance/events.inc | 10 +- data/maps/FarawayIsland_Entrance/header.inc | 4 +- data/maps/FarawayIsland_Interior/events.inc | 6 +- data/maps/FarawayIsland_Interior/header.inc | 4 +- data/maps/FieryPath/events.inc | 6 +- data/maps/FieryPath/header.inc | 4 +- data/maps/FortreeCity/connections.inc | 6 +- data/maps/FortreeCity/events.inc | 8 +- data/maps/FortreeCity/header.inc | 4 +- .../FortreeCity_DecorationShop/events.inc | 6 +- .../FortreeCity_DecorationShop/header.inc | 4 +- data/maps/FortreeCity_Gym/events.inc | 8 +- data/maps/FortreeCity_Gym/header.inc | 4 +- data/maps/FortreeCity_House1/events.inc | 6 +- data/maps/FortreeCity_House1/header.inc | 4 +- data/maps/FortreeCity_House2/events.inc | 6 +- data/maps/FortreeCity_House2/header.inc | 4 +- data/maps/FortreeCity_House3/events.inc | 6 +- data/maps/FortreeCity_House3/header.inc | 4 +- data/maps/FortreeCity_House4/events.inc | 6 +- data/maps/FortreeCity_House4/header.inc | 4 +- data/maps/FortreeCity_House5/events.inc | 6 +- data/maps/FortreeCity_House5/header.inc | 4 +- data/maps/FortreeCity_Mart/events.inc | 6 +- data/maps/FortreeCity_Mart/header.inc | 4 +- .../FortreeCity_PokemonCenter_1F/events.inc | 6 +- .../FortreeCity_PokemonCenter_1F/header.inc | 4 +- .../FortreeCity_PokemonCenter_2F/events.inc | 6 +- .../FortreeCity_PokemonCenter_2F/header.inc | 4 +- data/maps/GraniteCave_1F/events.inc | 6 +- data/maps/GraniteCave_1F/header.inc | 4 +- data/maps/GraniteCave_B1F/events.inc | 6 +- data/maps/GraniteCave_B1F/header.inc | 4 +- data/maps/GraniteCave_B2F/events.inc | 8 +- data/maps/GraniteCave_B2F/header.inc | 4 +- data/maps/GraniteCave_StevensRoom/events.inc | 6 +- data/maps/GraniteCave_StevensRoom/header.inc | 4 +- data/maps/InsideOfTruck/events.inc | 10 +- data/maps/InsideOfTruck/header.inc | 4 +- data/maps/IslandCave/events.inc | 8 +- data/maps/IslandCave/header.inc | 4 +- data/maps/JaggedPass/events.inc | 10 +- data/maps/JaggedPass/header.inc | 4 +- data/maps/LavaridgeTown/connections.inc | 6 +- data/maps/LavaridgeTown/events.inc | 10 +- data/maps/LavaridgeTown/header.inc | 4 +- data/maps/LavaridgeTown_Gym_1F/events.inc | 8 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 4 +- data/maps/LavaridgeTown_Gym_B1F/events.inc | 6 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 4 +- data/maps/LavaridgeTown_HerbShop/events.inc | 6 +- data/maps/LavaridgeTown_HerbShop/header.inc | 4 +- data/maps/LavaridgeTown_House/events.inc | 6 +- data/maps/LavaridgeTown_House/header.inc | 4 +- data/maps/LavaridgeTown_Mart/events.inc | 6 +- data/maps/LavaridgeTown_Mart/header.inc | 4 +- .../LavaridgeTown_PokemonCenter_1F/events.inc | 6 +- .../LavaridgeTown_PokemonCenter_1F/header.inc | 4 +- .../LavaridgeTown_PokemonCenter_2F/events.inc | 6 +- .../LavaridgeTown_PokemonCenter_2F/header.inc | 4 +- data/maps/LilycoveCity/connections.inc | 6 +- data/maps/LilycoveCity/events.inc | 8 +- data/maps/LilycoveCity/header.inc | 4 +- data/maps/LilycoveCity_ContestHall/events.inc | 8 +- data/maps/LilycoveCity_ContestHall/header.inc | 4 +- .../maps/LilycoveCity_ContestLobby/events.inc | 8 +- .../maps/LilycoveCity_ContestLobby/header.inc | 4 +- .../LilycoveCity_CoveLilyMotel_1F/events.inc | 8 +- .../LilycoveCity_CoveLilyMotel_1F/header.inc | 4 +- .../LilycoveCity_CoveLilyMotel_2F/events.inc | 6 +- .../LilycoveCity_CoveLilyMotel_2F/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/LilycoveCity_Harbor/events.inc | 6 +- data/maps/LilycoveCity_Harbor/header.inc | 4 +- data/maps/LilycoveCity_House1/events.inc | 6 +- data/maps/LilycoveCity_House1/header.inc | 4 +- data/maps/LilycoveCity_House2/events.inc | 6 +- data/maps/LilycoveCity_House2/header.inc | 4 +- data/maps/LilycoveCity_House3/events.inc | 6 +- data/maps/LilycoveCity_House3/header.inc | 4 +- data/maps/LilycoveCity_House4/events.inc | 6 +- data/maps/LilycoveCity_House4/header.inc | 4 +- .../LilycoveCity_LilycoveMuseum_1F/events.inc | 8 +- .../LilycoveCity_LilycoveMuseum_1F/header.inc | 4 +- .../LilycoveCity_LilycoveMuseum_2F/events.inc | 8 +- .../LilycoveCity_LilycoveMuseum_2F/header.inc | 4 +- .../LilycoveCity_MoveDeletersHouse/events.inc | 6 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 4 +- .../LilycoveCity_PokemonCenter_1F/events.inc | 6 +- .../LilycoveCity_PokemonCenter_1F/header.inc | 4 +- .../LilycoveCity_PokemonCenter_2F/events.inc | 6 +- .../LilycoveCity_PokemonCenter_2F/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/LilycoveCity_UnusedMart/events.inc | 4 +- data/maps/LilycoveCity_UnusedMart/header.inc | 4 +- data/maps/LinkContestRoom1/events.inc | 5 +- data/maps/LinkContestRoom1/header.inc | 4 +- data/maps/LinkContestRoom2/header.inc | 4 +- data/maps/LinkContestRoom3/header.inc | 4 +- data/maps/LinkContestRoom4/header.inc | 4 +- data/maps/LinkContestRoom5/header.inc | 4 +- data/maps/LinkContestRoom6/header.inc | 4 +- data/maps/LittlerootTown/connections.inc | 6 +- data/maps/LittlerootTown/events.inc | 10 +- data/maps/LittlerootTown/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../LittlerootTown_MaysHouse_1F/events.inc | 8 +- .../LittlerootTown_MaysHouse_1F/header.inc | 4 +- .../LittlerootTown_MaysHouse_2F/events.inc | 8 +- .../LittlerootTown_MaysHouse_2F/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- data/maps/MagmaHideout_1F/events.inc | 6 +- data/maps/MagmaHideout_1F/header.inc | 4 +- data/maps/MagmaHideout_2F_1R/events.inc | 6 +- data/maps/MagmaHideout_2F_1R/header.inc | 4 +- data/maps/MagmaHideout_2F_2R/events.inc | 6 +- data/maps/MagmaHideout_2F_2R/header.inc | 4 +- data/maps/MagmaHideout_2F_3R/events.inc | 4 +- data/maps/MagmaHideout_2F_3R/header.inc | 4 +- data/maps/MagmaHideout_3F_1R/events.inc | 6 +- data/maps/MagmaHideout_3F_1R/header.inc | 4 +- data/maps/MagmaHideout_3F_2R/events.inc | 6 +- data/maps/MagmaHideout_3F_2R/header.inc | 4 +- data/maps/MagmaHideout_3F_3R/events.inc | 6 +- data/maps/MagmaHideout_3F_3R/header.inc | 4 +- data/maps/MagmaHideout_4F/events.inc | 6 +- data/maps/MagmaHideout_4F/header.inc | 4 +- data/maps/MarineCave_End/events.inc | 8 +- data/maps/MarineCave_End/header.inc | 4 +- data/maps/MarineCave_Entrance/events.inc | 4 +- data/maps/MarineCave_Entrance/header.inc | 4 +- data/maps/MauvilleCity/connections.inc | 6 +- data/maps/MauvilleCity/events.inc | 8 +- data/maps/MauvilleCity/header.inc | 4 +- data/maps/MauvilleCity_BikeShop/events.inc | 8 +- data/maps/MauvilleCity_BikeShop/header.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 8 +- data/maps/MauvilleCity_GameCorner/header.inc | 4 +- data/maps/MauvilleCity_Gym/events.inc | 10 +- data/maps/MauvilleCity_Gym/header.inc | 4 +- data/maps/MauvilleCity_House1/events.inc | 6 +- data/maps/MauvilleCity_House1/header.inc | 4 +- data/maps/MauvilleCity_House2/events.inc | 6 +- data/maps/MauvilleCity_House2/header.inc | 4 +- data/maps/MauvilleCity_Mart/events.inc | 6 +- data/maps/MauvilleCity_Mart/header.inc | 4 +- .../MauvilleCity_PokemonCenter_1F/events.inc | 6 +- .../MauvilleCity_PokemonCenter_1F/header.inc | 4 +- .../MauvilleCity_PokemonCenter_2F/events.inc | 6 +- .../MauvilleCity_PokemonCenter_2F/header.inc | 4 +- data/maps/MeteorFalls_1F_1R/events.inc | 10 +- data/maps/MeteorFalls_1F_1R/header.inc | 4 +- data/maps/MeteorFalls_1F_2R/events.inc | 8 +- data/maps/MeteorFalls_1F_2R/header.inc | 4 +- data/maps/MeteorFalls_B1F_1R/events.inc | 4 +- data/maps/MeteorFalls_B1F_1R/header.inc | 4 +- data/maps/MeteorFalls_B1F_2R/events.inc | 6 +- data/maps/MeteorFalls_B1F_2R/header.inc | 4 +- data/maps/MeteorFalls_StevensCave/events.inc | 6 +- data/maps/MeteorFalls_StevensCave/header.inc | 4 +- data/maps/MirageTower_1F/events.inc | 4 +- data/maps/MirageTower_1F/header.inc | 4 +- data/maps/MirageTower_2F/events.inc | 4 +- data/maps/MirageTower_2F/header.inc | 4 +- data/maps/MirageTower_3F/events.inc | 6 +- data/maps/MirageTower_3F/header.inc | 4 +- data/maps/MirageTower_4F/events.inc | 6 +- data/maps/MirageTower_4F/header.inc | 4 +- data/maps/MossdeepCity/connections.inc | 7 +- data/maps/MossdeepCity/events.inc | 10 +- data/maps/MossdeepCity/header.inc | 4 +- .../MossdeepCity_GameCorner_1F/events.inc | 8 +- .../MossdeepCity_GameCorner_1F/header.inc | 4 +- .../MossdeepCity_GameCorner_B1F/events.inc | 6 +- .../MossdeepCity_GameCorner_B1F/header.inc | 4 +- data/maps/MossdeepCity_Gym/events.inc | 10 +- data/maps/MossdeepCity_Gym/header.inc | 4 +- data/maps/MossdeepCity_House1/events.inc | 6 +- data/maps/MossdeepCity_House1/header.inc | 4 +- data/maps/MossdeepCity_House2/events.inc | 6 +- data/maps/MossdeepCity_House2/header.inc | 4 +- data/maps/MossdeepCity_House3/events.inc | 6 +- data/maps/MossdeepCity_House3/header.inc | 4 +- data/maps/MossdeepCity_House4/events.inc | 6 +- data/maps/MossdeepCity_House4/header.inc | 4 +- data/maps/MossdeepCity_Mart/events.inc | 6 +- data/maps/MossdeepCity_Mart/header.inc | 4 +- .../MossdeepCity_PokemonCenter_1F/events.inc | 6 +- .../MossdeepCity_PokemonCenter_1F/header.inc | 4 +- .../MossdeepCity_PokemonCenter_2F/events.inc | 6 +- .../MossdeepCity_PokemonCenter_2F/header.inc | 4 +- .../MossdeepCity_SpaceCenter_1F/events.inc | 6 +- .../MossdeepCity_SpaceCenter_1F/header.inc | 4 +- .../MossdeepCity_SpaceCenter_2F/events.inc | 6 +- .../MossdeepCity_SpaceCenter_2F/header.inc | 4 +- .../maps/MossdeepCity_StevensHouse/events.inc | 8 +- .../maps/MossdeepCity_StevensHouse/header.inc | 4 +- data/maps/MtChimney/events.inc | 8 +- data/maps/MtChimney/header.inc | 4 +- .../maps/MtChimney_CableCarStation/events.inc | 6 +- .../maps/MtChimney_CableCarStation/header.inc | 4 +- data/maps/MtPyre_1F/events.inc | 6 +- data/maps/MtPyre_1F/header.inc | 4 +- data/maps/MtPyre_2F/events.inc | 6 +- data/maps/MtPyre_2F/header.inc | 4 +- data/maps/MtPyre_3F/events.inc | 6 +- data/maps/MtPyre_3F/header.inc | 4 +- data/maps/MtPyre_4F/events.inc | 6 +- data/maps/MtPyre_4F/header.inc | 4 +- data/maps/MtPyre_5F/events.inc | 6 +- data/maps/MtPyre_5F/header.inc | 4 +- data/maps/MtPyre_6F/events.inc | 6 +- data/maps/MtPyre_6F/header.inc | 4 +- data/maps/MtPyre_Exterior/events.inc | 10 +- data/maps/MtPyre_Exterior/header.inc | 4 +- data/maps/MtPyre_Summit/events.inc | 10 +- data/maps/MtPyre_Summit/header.inc | 4 +- data/maps/NavelRock_B1F/events.inc | 4 +- data/maps/NavelRock_B1F/header.inc | 4 +- data/maps/NavelRock_Bottom/events.inc | 6 +- data/maps/NavelRock_Bottom/header.inc | 4 +- data/maps/NavelRock_Down01/events.inc | 4 +- data/maps/NavelRock_Down01/header.inc | 4 +- data/maps/NavelRock_Down02/events.inc | 4 +- data/maps/NavelRock_Down02/header.inc | 4 +- data/maps/NavelRock_Down03/events.inc | 4 +- data/maps/NavelRock_Down03/header.inc | 4 +- data/maps/NavelRock_Down04/events.inc | 4 +- data/maps/NavelRock_Down04/header.inc | 4 +- data/maps/NavelRock_Down05/events.inc | 4 +- data/maps/NavelRock_Down05/header.inc | 4 +- data/maps/NavelRock_Down06/events.inc | 4 +- data/maps/NavelRock_Down06/header.inc | 4 +- data/maps/NavelRock_Down07/events.inc | 4 +- data/maps/NavelRock_Down07/header.inc | 4 +- data/maps/NavelRock_Down08/events.inc | 4 +- data/maps/NavelRock_Down08/header.inc | 4 +- data/maps/NavelRock_Down09/events.inc | 4 +- data/maps/NavelRock_Down09/header.inc | 4 +- data/maps/NavelRock_Down10/events.inc | 4 +- data/maps/NavelRock_Down10/header.inc | 4 +- data/maps/NavelRock_Down11/events.inc | 4 +- data/maps/NavelRock_Down11/header.inc | 4 +- data/maps/NavelRock_Entrance/events.inc | 4 +- data/maps/NavelRock_Entrance/header.inc | 4 +- data/maps/NavelRock_Exterior/events.inc | 4 +- data/maps/NavelRock_Exterior/header.inc | 4 +- data/maps/NavelRock_Fork/events.inc | 4 +- data/maps/NavelRock_Fork/header.inc | 4 +- data/maps/NavelRock_Harbor/events.inc | 6 +- data/maps/NavelRock_Harbor/header.inc | 4 +- data/maps/NavelRock_Top/events.inc | 10 +- data/maps/NavelRock_Top/header.inc | 4 +- data/maps/NavelRock_Up1/events.inc | 4 +- data/maps/NavelRock_Up1/header.inc | 4 +- data/maps/NavelRock_Up2/events.inc | 4 +- data/maps/NavelRock_Up2/header.inc | 4 +- data/maps/NavelRock_Up3/events.inc | 4 +- data/maps/NavelRock_Up3/header.inc | 4 +- data/maps/NavelRock_Up4/events.inc | 4 +- data/maps/NavelRock_Up4/header.inc | 4 +- data/maps/NewMauville_Entrance/events.inc | 6 +- data/maps/NewMauville_Entrance/header.inc | 4 +- data/maps/NewMauville_Inside/events.inc | 10 +- data/maps/NewMauville_Inside/header.inc | 4 +- data/maps/OldaleTown/connections.inc | 6 +- data/maps/OldaleTown/events.inc | 10 +- data/maps/OldaleTown/header.inc | 4 +- data/maps/OldaleTown_House1/events.inc | 6 +- data/maps/OldaleTown_House1/header.inc | 4 +- data/maps/OldaleTown_House2/events.inc | 6 +- data/maps/OldaleTown_House2/header.inc | 4 +- data/maps/OldaleTown_Mart/events.inc | 6 +- data/maps/OldaleTown_Mart/header.inc | 4 +- .../OldaleTown_PokemonCenter_1F/events.inc | 6 +- .../OldaleTown_PokemonCenter_1F/header.inc | 4 +- .../OldaleTown_PokemonCenter_2F/events.inc | 6 +- .../OldaleTown_PokemonCenter_2F/header.inc | 4 +- data/maps/PacifidlogTown/connections.inc | 6 +- data/maps/PacifidlogTown/events.inc | 8 +- data/maps/PacifidlogTown/header.inc | 4 +- data/maps/PacifidlogTown_House1/events.inc | 6 +- data/maps/PacifidlogTown_House1/header.inc | 4 +- data/maps/PacifidlogTown_House2/events.inc | 6 +- data/maps/PacifidlogTown_House2/header.inc | 4 +- data/maps/PacifidlogTown_House3/events.inc | 6 +- data/maps/PacifidlogTown_House3/header.inc | 4 +- data/maps/PacifidlogTown_House4/events.inc | 6 +- data/maps/PacifidlogTown_House4/header.inc | 4 +- data/maps/PacifidlogTown_House5/events.inc | 6 +- data/maps/PacifidlogTown_House5/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/PetalburgCity/connections.inc | 6 +- data/maps/PetalburgCity/events.inc | 10 +- data/maps/PetalburgCity/header.inc | 4 +- data/maps/PetalburgCity_Gym/events.inc | 8 +- data/maps/PetalburgCity_Gym/header.inc | 4 +- data/maps/PetalburgCity_House1/events.inc | 6 +- data/maps/PetalburgCity_House1/header.inc | 4 +- data/maps/PetalburgCity_House2/events.inc | 6 +- data/maps/PetalburgCity_House2/header.inc | 4 +- data/maps/PetalburgCity_Mart/events.inc | 6 +- data/maps/PetalburgCity_Mart/header.inc | 4 +- .../PetalburgCity_PokemonCenter_1F/events.inc | 6 +- .../PetalburgCity_PokemonCenter_1F/header.inc | 4 +- .../PetalburgCity_PokemonCenter_2F/events.inc | 6 +- .../PetalburgCity_PokemonCenter_2F/header.inc | 4 +- .../maps/PetalburgCity_WallysHouse/events.inc | 6 +- .../maps/PetalburgCity_WallysHouse/header.inc | 4 +- data/maps/PetalburgWoods/events.inc | 10 +- data/maps/PetalburgWoods/header.inc | 4 +- data/maps/RecordCorner/events.inc | 8 +- data/maps/RecordCorner/header.inc | 4 +- data/maps/Route101/connections.inc | 6 +- data/maps/Route101/events.inc | 8 +- data/maps/Route101/header.inc | 4 +- data/maps/Route102/connections.inc | 6 +- data/maps/Route102/events.inc | 6 +- data/maps/Route102/header.inc | 4 +- data/maps/Route103/connections.inc | 6 +- data/maps/Route103/events.inc | 8 +- data/maps/Route103/header.inc | 4 +- data/maps/Route104/connections.inc | 6 +- data/maps/Route104/events.inc | 10 +- data/maps/Route104/header.inc | 4 +- data/maps/Route104_MrBrineysHouse/events.inc | 6 +- data/maps/Route104_MrBrineysHouse/header.inc | 4 +- .../Route104_PrettyPetalFlowerShop/events.inc | 6 +- .../Route104_PrettyPetalFlowerShop/header.inc | 4 +- data/maps/Route104_Prototype/events.inc | 2 +- data/maps/Route104_Prototype/header.inc | 4 +- .../events.inc | 2 +- .../header.inc | 4 +- data/maps/Route105/connections.inc | 6 +- data/maps/Route105/events.inc | 8 +- data/maps/Route105/header.inc | 4 +- data/maps/Route106/connections.inc | 6 +- data/maps/Route106/events.inc | 8 +- data/maps/Route106/header.inc | 4 +- data/maps/Route107/connections.inc | 6 +- data/maps/Route107/events.inc | 4 +- data/maps/Route107/header.inc | 4 +- data/maps/Route108/connections.inc | 6 +- data/maps/Route108/events.inc | 8 +- data/maps/Route108/header.inc | 4 +- data/maps/Route109/connections.inc | 6 +- data/maps/Route109/events.inc | 9 +- data/maps/Route109/header.inc | 4 +- data/maps/Route109_SeashoreHouse/events.inc | 6 +- data/maps/Route109_SeashoreHouse/header.inc | 4 +- data/maps/Route110/connections.inc | 6 +- data/maps/Route110/events.inc | 10 +- data/maps/Route110/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../Route110_TrickHouseCorridor/events.inc | 4 +- .../Route110_TrickHouseCorridor/header.inc | 4 +- data/maps/Route110_TrickHouseEnd/events.inc | 10 +- data/maps/Route110_TrickHouseEnd/header.inc | 4 +- .../Route110_TrickHouseEntrance/events.inc | 10 +- .../Route110_TrickHouseEntrance/header.inc | 4 +- .../Route110_TrickHousePuzzle1/events.inc | 8 +- .../Route110_TrickHousePuzzle1/header.inc | 4 +- .../Route110_TrickHousePuzzle2/events.inc | 10 +- .../Route110_TrickHousePuzzle2/header.inc | 4 +- .../Route110_TrickHousePuzzle3/events.inc | 10 +- .../Route110_TrickHousePuzzle3/header.inc | 4 +- .../Route110_TrickHousePuzzle4/events.inc | 8 +- .../Route110_TrickHousePuzzle4/header.inc | 4 +- .../Route110_TrickHousePuzzle5/events.inc | 10 +- .../Route110_TrickHousePuzzle5/header.inc | 4 +- .../Route110_TrickHousePuzzle6/events.inc | 8 +- .../Route110_TrickHousePuzzle6/header.inc | 4 +- .../Route110_TrickHousePuzzle7/events.inc | 10 +- .../Route110_TrickHousePuzzle7/header.inc | 4 +- .../Route110_TrickHousePuzzle8/events.inc | 8 +- .../Route110_TrickHousePuzzle8/header.inc | 4 +- data/maps/Route111/connections.inc | 6 +- data/maps/Route111/events.inc | 10 +- data/maps/Route111/header.inc | 4 +- .../maps/Route111_OldLadysRestStop/events.inc | 6 +- .../maps/Route111_OldLadysRestStop/header.inc | 4 +- .../Route111_WinstrateFamilysHouse/events.inc | 6 +- .../Route111_WinstrateFamilysHouse/header.inc | 4 +- data/maps/Route112/connections.inc | 6 +- data/maps/Route112/events.inc | 8 +- data/maps/Route112/header.inc | 4 +- data/maps/Route112_CableCarStation/events.inc | 6 +- data/maps/Route112_CableCarStation/header.inc | 4 +- data/maps/Route113/connections.inc | 6 +- data/maps/Route113/events.inc | 10 +- data/maps/Route113/header.inc | 4 +- data/maps/Route113_GlassWorkshop/events.inc | 6 +- data/maps/Route113_GlassWorkshop/header.inc | 4 +- data/maps/Route114/connections.inc | 6 +- data/maps/Route114/events.inc | 8 +- data/maps/Route114/header.inc | 4 +- .../Route114_FossilManiacsHouse/events.inc | 8 +- .../Route114_FossilManiacsHouse/header.inc | 4 +- .../Route114_FossilManiacsTunnel/events.inc | 8 +- .../Route114_FossilManiacsTunnel/header.inc | 4 +- data/maps/Route114_LanettesHouse/events.inc | 8 +- data/maps/Route114_LanettesHouse/header.inc | 4 +- data/maps/Route115/connections.inc | 6 +- data/maps/Route115/events.inc | 8 +- data/maps/Route115/header.inc | 4 +- data/maps/Route116/connections.inc | 6 +- data/maps/Route116/events.inc | 10 +- data/maps/Route116/header.inc | 4 +- .../Route116_TunnelersRestHouse/events.inc | 6 +- .../Route116_TunnelersRestHouse/header.inc | 4 +- data/maps/Route117/connections.inc | 6 +- data/maps/Route117/events.inc | 8 +- data/maps/Route117/header.inc | 4 +- data/maps/Route117_PokemonDayCare/events.inc | 6 +- data/maps/Route117_PokemonDayCare/header.inc | 4 +- data/maps/Route118/connections.inc | 6 +- data/maps/Route118/events.inc | 10 +- data/maps/Route118/header.inc | 4 +- data/maps/Route119/connections.inc | 6 +- data/maps/Route119/events.inc | 10 +- data/maps/Route119/header.inc | 4 +- data/maps/Route119_House/events.inc | 6 +- data/maps/Route119_House/header.inc | 4 +- .../Route119_WeatherInstitute_1F/events.inc | 8 +- .../Route119_WeatherInstitute_1F/header.inc | 4 +- .../Route119_WeatherInstitute_2F/events.inc | 6 +- .../Route119_WeatherInstitute_2F/header.inc | 4 +- data/maps/Route120/connections.inc | 6 +- data/maps/Route120/events.inc | 10 +- data/maps/Route120/header.inc | 4 +- data/maps/Route121/connections.inc | 6 +- data/maps/Route121/events.inc | 10 +- data/maps/Route121/header.inc | 4 +- .../Route121_SafariZoneEntrance/events.inc | 10 +- .../Route121_SafariZoneEntrance/header.inc | 4 +- data/maps/Route122/connections.inc | 6 +- data/maps/Route122/events.inc | 4 +- data/maps/Route122/header.inc | 4 +- data/maps/Route123/connections.inc | 6 +- data/maps/Route123/events.inc | 10 +- data/maps/Route123/header.inc | 4 +- .../Route123_BerryMastersHouse/events.inc | 6 +- .../Route123_BerryMastersHouse/header.inc | 4 +- data/maps/Route124/connections.inc | 6 +- data/maps/Route124/events.inc | 8 +- data/maps/Route124/header.inc | 4 +- .../events.inc | 9 +- .../header.inc | 4 +- data/maps/Route125/connections.inc | 6 +- data/maps/Route125/events.inc | 8 +- data/maps/Route125/header.inc | 4 +- data/maps/Route126/connections.inc | 6 +- data/maps/Route126/events.inc | 4 +- data/maps/Route126/header.inc | 4 +- data/maps/Route127/connections.inc | 6 +- data/maps/Route127/events.inc | 6 +- data/maps/Route127/header.inc | 4 +- data/maps/Route128/connections.inc | 6 +- data/maps/Route128/events.inc | 6 +- data/maps/Route128/header.inc | 4 +- data/maps/Route129/connections.inc | 6 +- data/maps/Route129/events.inc | 4 +- data/maps/Route129/header.inc | 4 +- data/maps/Route130/connections.inc | 6 +- data/maps/Route130/events.inc | 4 +- data/maps/Route130/header.inc | 4 +- data/maps/Route131/connections.inc | 6 +- data/maps/Route131/events.inc | 6 +- data/maps/Route131/header.inc | 4 +- data/maps/Route132/connections.inc | 6 +- data/maps/Route132/events.inc | 4 +- data/maps/Route132/header.inc | 4 +- data/maps/Route133/connections.inc | 6 +- data/maps/Route133/events.inc | 4 +- data/maps/Route133/header.inc | 4 +- data/maps/Route134/connections.inc | 6 +- data/maps/Route134/events.inc | 4 +- data/maps/Route134/header.inc | 4 +- data/maps/RustboroCity/connections.inc | 6 +- data/maps/RustboroCity/events.inc | 10 +- data/maps/RustboroCity/header.inc | 4 +- .../maps/RustboroCity_CuttersHouse/events.inc | 6 +- .../maps/RustboroCity_CuttersHouse/header.inc | 4 +- .../maps/RustboroCity_DevonCorp_1F/events.inc | 8 +- .../maps/RustboroCity_DevonCorp_1F/header.inc | 4 +- .../maps/RustboroCity_DevonCorp_2F/events.inc | 6 +- .../maps/RustboroCity_DevonCorp_2F/header.inc | 4 +- .../maps/RustboroCity_DevonCorp_3F/events.inc | 8 +- .../maps/RustboroCity_DevonCorp_3F/header.inc | 4 +- data/maps/RustboroCity_Flat1_1F/events.inc | 6 +- data/maps/RustboroCity_Flat1_1F/header.inc | 4 +- data/maps/RustboroCity_Flat1_2F/events.inc | 6 +- data/maps/RustboroCity_Flat1_2F/header.inc | 4 +- data/maps/RustboroCity_Flat2_1F/events.inc | 6 +- data/maps/RustboroCity_Flat2_1F/header.inc | 4 +- data/maps/RustboroCity_Flat2_2F/events.inc | 6 +- data/maps/RustboroCity_Flat2_2F/header.inc | 4 +- data/maps/RustboroCity_Flat2_3F/events.inc | 6 +- data/maps/RustboroCity_Flat2_3F/header.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 8 +- data/maps/RustboroCity_Gym/header.inc | 4 +- data/maps/RustboroCity_House1/events.inc | 6 +- data/maps/RustboroCity_House1/header.inc | 4 +- data/maps/RustboroCity_House2/events.inc | 6 +- data/maps/RustboroCity_House2/header.inc | 4 +- data/maps/RustboroCity_House3/events.inc | 6 +- data/maps/RustboroCity_House3/header.inc | 4 +- data/maps/RustboroCity_Mart/events.inc | 6 +- data/maps/RustboroCity_Mart/header.inc | 4 +- .../RustboroCity_PokemonCenter_1F/events.inc | 6 +- .../RustboroCity_PokemonCenter_1F/header.inc | 4 +- .../RustboroCity_PokemonCenter_2F/events.inc | 6 +- .../RustboroCity_PokemonCenter_2F/header.inc | 4 +- .../RustboroCity_PokemonSchool/events.inc | 8 +- .../RustboroCity_PokemonSchool/header.inc | 4 +- data/maps/RusturfTunnel/events.inc | 8 +- data/maps/RusturfTunnel/header.inc | 4 +- data/maps/SSTidalCorridor/events.inc | 8 +- data/maps/SSTidalCorridor/header.inc | 4 +- data/maps/SSTidalLowerDeck/events.inc | 8 +- data/maps/SSTidalLowerDeck/header.inc | 4 +- data/maps/SSTidalRooms/events.inc | 8 +- data/maps/SSTidalRooms/header.inc | 4 +- data/maps/SafariZone_North/connections.inc | 6 +- data/maps/SafariZone_North/events.inc | 4 +- data/maps/SafariZone_North/header.inc | 4 +- .../maps/SafariZone_Northeast/connections.inc | 6 +- data/maps/SafariZone_Northeast/events.inc | 6 +- data/maps/SafariZone_Northeast/header.inc | 4 +- .../maps/SafariZone_Northwest/connections.inc | 6 +- data/maps/SafariZone_Northwest/events.inc | 4 +- data/maps/SafariZone_Northwest/header.inc | 4 +- data/maps/SafariZone_RestHouse/events.inc | 6 +- data/maps/SafariZone_RestHouse/header.inc | 4 +- data/maps/SafariZone_South/connections.inc | 6 +- data/maps/SafariZone_South/events.inc | 6 +- data/maps/SafariZone_South/header.inc | 4 +- .../maps/SafariZone_Southeast/connections.inc | 6 +- data/maps/SafariZone_Southeast/events.inc | 6 +- data/maps/SafariZone_Southeast/header.inc | 4 +- .../maps/SafariZone_Southwest/connections.inc | 6 +- data/maps/SafariZone_Southwest/events.inc | 8 +- data/maps/SafariZone_Southwest/header.inc | 4 +- data/maps/ScorchedSlab/events.inc | 6 +- data/maps/ScorchedSlab/header.inc | 4 +- data/maps/SeafloorCavern_Entrance/events.inc | 6 +- data/maps/SeafloorCavern_Entrance/header.inc | 4 +- data/maps/SeafloorCavern_Room1/events.inc | 6 +- data/maps/SeafloorCavern_Room1/header.inc | 4 +- data/maps/SeafloorCavern_Room2/events.inc | 6 +- data/maps/SeafloorCavern_Room2/header.inc | 4 +- data/maps/SeafloorCavern_Room3/events.inc | 6 +- data/maps/SeafloorCavern_Room3/header.inc | 4 +- data/maps/SeafloorCavern_Room4/events.inc | 6 +- data/maps/SeafloorCavern_Room4/header.inc | 4 +- data/maps/SeafloorCavern_Room5/events.inc | 6 +- data/maps/SeafloorCavern_Room5/header.inc | 4 +- data/maps/SeafloorCavern_Room6/events.inc | 4 +- data/maps/SeafloorCavern_Room6/header.inc | 4 +- data/maps/SeafloorCavern_Room7/events.inc | 4 +- data/maps/SeafloorCavern_Room7/header.inc | 4 +- data/maps/SeafloorCavern_Room8/events.inc | 6 +- data/maps/SeafloorCavern_Room8/header.inc | 4 +- data/maps/SeafloorCavern_Room9/events.inc | 8 +- data/maps/SeafloorCavern_Room9/header.inc | 4 +- data/maps/SealedChamber_InnerRoom/events.inc | 6 +- data/maps/SealedChamber_InnerRoom/header.inc | 4 +- data/maps/SealedChamber_OuterRoom/events.inc | 6 +- data/maps/SealedChamber_OuterRoom/header.inc | 4 +- data/maps/SecretBase_BlueCave1/events.inc | 6 +- data/maps/SecretBase_BlueCave1/header.inc | 4 +- data/maps/SecretBase_BlueCave2/events.inc | 6 +- data/maps/SecretBase_BlueCave2/header.inc | 4 +- data/maps/SecretBase_BlueCave3/events.inc | 6 +- data/maps/SecretBase_BlueCave3/header.inc | 4 +- data/maps/SecretBase_BlueCave4/events.inc | 6 +- data/maps/SecretBase_BlueCave4/header.inc | 4 +- data/maps/SecretBase_BrownCave1/events.inc | 6 +- data/maps/SecretBase_BrownCave1/header.inc | 4 +- data/maps/SecretBase_BrownCave2/events.inc | 6 +- data/maps/SecretBase_BrownCave2/header.inc | 4 +- data/maps/SecretBase_BrownCave3/events.inc | 6 +- data/maps/SecretBase_BrownCave3/header.inc | 4 +- data/maps/SecretBase_BrownCave4/events.inc | 6 +- data/maps/SecretBase_BrownCave4/header.inc | 4 +- data/maps/SecretBase_RedCave1/events.inc | 6 +- data/maps/SecretBase_RedCave1/header.inc | 4 +- data/maps/SecretBase_RedCave2/events.inc | 6 +- data/maps/SecretBase_RedCave2/header.inc | 4 +- data/maps/SecretBase_RedCave3/events.inc | 6 +- data/maps/SecretBase_RedCave3/header.inc | 4 +- data/maps/SecretBase_RedCave4/events.inc | 6 +- data/maps/SecretBase_RedCave4/header.inc | 4 +- data/maps/SecretBase_Shrub1/events.inc | 6 +- data/maps/SecretBase_Shrub1/header.inc | 4 +- data/maps/SecretBase_Shrub2/events.inc | 6 +- data/maps/SecretBase_Shrub2/header.inc | 4 +- data/maps/SecretBase_Shrub3/events.inc | 6 +- data/maps/SecretBase_Shrub3/header.inc | 4 +- data/maps/SecretBase_Shrub4/events.inc | 6 +- data/maps/SecretBase_Shrub4/header.inc | 4 +- data/maps/SecretBase_Tree1/events.inc | 6 +- data/maps/SecretBase_Tree1/header.inc | 4 +- data/maps/SecretBase_Tree2/events.inc | 6 +- data/maps/SecretBase_Tree2/header.inc | 4 +- data/maps/SecretBase_Tree3/events.inc | 6 +- data/maps/SecretBase_Tree3/header.inc | 4 +- data/maps/SecretBase_Tree4/events.inc | 6 +- data/maps/SecretBase_Tree4/header.inc | 4 +- data/maps/SecretBase_YellowCave1/events.inc | 6 +- data/maps/SecretBase_YellowCave1/header.inc | 4 +- data/maps/SecretBase_YellowCave2/events.inc | 6 +- data/maps/SecretBase_YellowCave2/header.inc | 4 +- data/maps/SecretBase_YellowCave3/events.inc | 6 +- data/maps/SecretBase_YellowCave3/header.inc | 4 +- data/maps/SecretBase_YellowCave4/events.inc | 6 +- data/maps/SecretBase_YellowCave4/header.inc | 4 +- .../ShoalCave_HighTideEntranceRoom/events.inc | 2 +- .../ShoalCave_HighTideEntranceRoom/header.inc | 4 +- .../ShoalCave_HighTideInnerRoom/events.inc | 2 +- .../ShoalCave_HighTideInnerRoom/header.inc | 4 +- .../ShoalCave_LowTideEntranceRoom/events.inc | 6 +- .../ShoalCave_LowTideEntranceRoom/header.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 6 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 4 +- .../ShoalCave_LowTideInnerRoom/events.inc | 8 +- .../ShoalCave_LowTideInnerRoom/header.inc | 4 +- .../ShoalCave_LowTideLowerRoom/events.inc | 8 +- .../ShoalCave_LowTideLowerRoom/header.inc | 4 +- .../ShoalCave_LowTideStairsRoom/events.inc | 8 +- .../ShoalCave_LowTideStairsRoom/header.inc | 4 +- data/maps/SingleBattleColosseum/events.inc | 8 +- data/maps/SingleBattleColosseum/header.inc | 4 +- data/maps/SkyPillar_1F/events.inc | 4 +- data/maps/SkyPillar_1F/header.inc | 4 +- data/maps/SkyPillar_2F/events.inc | 4 +- data/maps/SkyPillar_2F/header.inc | 4 +- data/maps/SkyPillar_3F/events.inc | 4 +- data/maps/SkyPillar_3F/header.inc | 4 +- data/maps/SkyPillar_4F/events.inc | 4 +- data/maps/SkyPillar_4F/header.inc | 4 +- data/maps/SkyPillar_5F/events.inc | 4 +- data/maps/SkyPillar_5F/header.inc | 4 +- data/maps/SkyPillar_Entrance/events.inc | 4 +- data/maps/SkyPillar_Entrance/header.inc | 4 +- data/maps/SkyPillar_Outside/events.inc | 6 +- data/maps/SkyPillar_Outside/header.inc | 4 +- data/maps/SkyPillar_Top/events.inc | 8 +- data/maps/SkyPillar_Top/header.inc | 4 +- data/maps/SlateportCity/connections.inc | 6 +- data/maps/SlateportCity/events.inc | 10 +- data/maps/SlateportCity/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../SlateportCity_BattleTentLobby/events.inc | 8 +- .../SlateportCity_BattleTentLobby/header.inc | 4 +- data/maps/SlateportCity_Harbor/events.inc | 8 +- data/maps/SlateportCity_Harbor/header.inc | 4 +- data/maps/SlateportCity_House1/events.inc | 6 +- data/maps/SlateportCity_House1/header.inc | 4 +- data/maps/SlateportCity_House2/events.inc | 6 +- data/maps/SlateportCity_House2/header.inc | 4 +- data/maps/SlateportCity_Mart/events.inc | 6 +- data/maps/SlateportCity_Mart/header.inc | 4 +- .../SlateportCity_OceanicMuseum_1F/events.inc | 10 +- .../SlateportCity_OceanicMuseum_1F/header.inc | 4 +- .../SlateportCity_OceanicMuseum_2F/events.inc | 8 +- .../SlateportCity_OceanicMuseum_2F/header.inc | 4 +- .../SlateportCity_PokemonCenter_1F/events.inc | 6 +- .../SlateportCity_PokemonCenter_1F/header.inc | 4 +- .../SlateportCity_PokemonCenter_2F/events.inc | 6 +- .../SlateportCity_PokemonCenter_2F/header.inc | 4 +- .../SlateportCity_PokemonFanClub/events.inc | 6 +- .../SlateportCity_PokemonFanClub/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/SootopolisCity/events.inc | 8 +- data/maps/SootopolisCity/header.inc | 4 +- data/maps/SootopolisCity_Gym_1F/events.inc | 8 +- data/maps/SootopolisCity_Gym_1F/header.inc | 4 +- data/maps/SootopolisCity_Gym_B1F/events.inc | 6 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 4 +- data/maps/SootopolisCity_House1/events.inc | 6 +- data/maps/SootopolisCity_House1/header.inc | 4 +- data/maps/SootopolisCity_House2/events.inc | 6 +- data/maps/SootopolisCity_House2/header.inc | 4 +- data/maps/SootopolisCity_House3/events.inc | 6 +- data/maps/SootopolisCity_House3/header.inc | 4 +- data/maps/SootopolisCity_House4/events.inc | 6 +- data/maps/SootopolisCity_House4/header.inc | 4 +- data/maps/SootopolisCity_House5/events.inc | 6 +- data/maps/SootopolisCity_House5/header.inc | 4 +- data/maps/SootopolisCity_House6/events.inc | 6 +- data/maps/SootopolisCity_House6/header.inc | 4 +- data/maps/SootopolisCity_House7/events.inc | 6 +- data/maps/SootopolisCity_House7/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- data/maps/SootopolisCity_Mart/events.inc | 6 +- data/maps/SootopolisCity_Mart/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/SouthernIsland_Exterior/events.inc | 8 +- data/maps/SouthernIsland_Exterior/header.inc | 4 +- data/maps/SouthernIsland_Interior/events.inc | 8 +- data/maps/SouthernIsland_Interior/header.inc | 4 +- data/maps/TerraCave_End/events.inc | 8 +- data/maps/TerraCave_End/header.inc | 4 +- data/maps/TerraCave_Entrance/events.inc | 4 +- data/maps/TerraCave_Entrance/header.inc | 4 +- data/maps/TradeCenter/events.inc | 8 +- data/maps/TradeCenter/header.inc | 4 +- data/maps/TrainerHill_1F/events.inc | 4 +- data/maps/TrainerHill_1F/header.inc | 4 +- data/maps/TrainerHill_2F/events.inc | 4 +- data/maps/TrainerHill_2F/header.inc | 4 +- data/maps/TrainerHill_3F/events.inc | 4 +- data/maps/TrainerHill_3F/header.inc | 4 +- data/maps/TrainerHill_4F/events.inc | 4 +- data/maps/TrainerHill_4F/header.inc | 4 +- data/maps/TrainerHill_Elevator/events.inc | 6 +- data/maps/TrainerHill_Elevator/header.inc | 4 +- data/maps/TrainerHill_Entrance/events.inc | 10 +- data/maps/TrainerHill_Entrance/header.inc | 4 +- data/maps/TrainerHill_Roof/events.inc | 6 +- data/maps/TrainerHill_Roof/header.inc | 4 +- data/maps/Underwater1/connections.inc | 6 +- data/maps/Underwater1/events.inc | 4 +- data/maps/Underwater1/header.inc | 4 +- data/maps/Underwater2/connections.inc | 6 +- data/maps/Underwater2/events.inc | 6 +- data/maps/Underwater2/header.inc | 4 +- data/maps/Underwater3/connections.inc | 6 +- data/maps/Underwater3/events.inc | 6 +- data/maps/Underwater3/header.inc | 4 +- data/maps/Underwater4/connections.inc | 6 +- data/maps/Underwater4/events.inc | 6 +- data/maps/Underwater4/header.inc | 4 +- data/maps/Underwater5/connections.inc | 6 +- data/maps/Underwater5/events.inc | 4 +- data/maps/Underwater5/header.inc | 4 +- data/maps/Underwater6/connections.inc | 6 +- data/maps/Underwater6/events.inc | 4 +- data/maps/Underwater6/header.inc | 4 +- data/maps/Underwater7/connections.inc | 6 +- data/maps/Underwater7/events.inc | 4 +- data/maps/Underwater7/header.inc | 4 +- data/maps/Underwater_MarineCave/events.inc | 4 +- data/maps/Underwater_MarineCave/header.inc | 4 +- data/maps/Underwater_Route134/events.inc | 4 +- data/maps/Underwater_Route134/header.inc | 4 +- .../maps/Underwater_SeafloorCavern/events.inc | 6 +- .../maps/Underwater_SeafloorCavern/header.inc | 4 +- data/maps/Underwater_SealedChamber/events.inc | 6 +- data/maps/Underwater_SealedChamber/header.inc | 4 +- .../maps/Underwater_SootopolisCity/events.inc | 4 +- .../maps/Underwater_SootopolisCity/header.inc | 4 +- data/maps/UnionRoom/events.inc | 6 +- data/maps/UnionRoom/header.inc | 4 +- data/maps/UnknownMap_25_29/header.inc | 4 +- data/maps/UnknownMap_25_30/header.inc | 4 +- data/maps/UnknownMap_25_31/header.inc | 4 +- data/maps/UnknownMap_25_32/header.inc | 4 +- data/maps/UnknownMap_25_33/header.inc | 4 +- data/maps/UnknownMap_25_34/header.inc | 4 +- data/maps/VerdanturfTown/connections.inc | 6 +- data/maps/VerdanturfTown/events.inc | 8 +- data/maps/VerdanturfTown/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../VerdanturfTown_BattleTentLobby/events.inc | 8 +- .../VerdanturfTown_BattleTentLobby/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/VerdanturfTown_House/events.inc | 6 +- data/maps/VerdanturfTown_House/header.inc | 4 +- data/maps/VerdanturfTown_Mart/events.inc | 6 +- data/maps/VerdanturfTown_Mart/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../VerdanturfTown_WandasHouse/events.inc | 6 +- .../VerdanturfTown_WandasHouse/header.inc | 4 +- data/maps/VictoryRoad_1F/events.inc | 10 +- data/maps/VictoryRoad_1F/header.inc | 4 +- data/maps/VictoryRoad_B1F/events.inc | 6 +- data/maps/VictoryRoad_B1F/header.inc | 4 +- data/maps/VictoryRoad_B2F/events.inc | 8 +- data/maps/VictoryRoad_B2F/header.inc | 4 +- include/constants/layouts.h | 446 ++++++++++++++++++ 1091 files changed, 3257 insertions(+), 2806 deletions(-) create mode 100755 include/constants/layouts.h diff --git a/data/maps.s b/data/maps.s index 56d9571396..6e6545fbce 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/layouts.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/weather.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index b59eb456a5..aff922c97e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,11 +1,11 @@ -AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C +AbandonedShip_CaptainsOffice_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY -AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C +AbandonedShip_CaptainsOffice_MapWarps: warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK -AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C +AbandonedShip_CaptainsOffice_MapEvents:: map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 3102e0614d..a3fbacdc7e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_CaptainsOffice: @ 84845A4 +AbandonedShip_CaptainsOffice: .4byte AbandonedShip_CaptainsOffice_Layout .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 195 + .2byte LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index 6653509157..e9efcc82ab 100644 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -1,8 +1,8 @@ -AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 +AbandonedShip_Corridors_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 -AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 +AbandonedShip_Corridors_1F_MapWarps: warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK @@ -16,6 +16,6 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F -AbandonedShip_Corridors_1F_MapEvents:: @ 8536750 +AbandonedShip_Corridors_1F_MapEvents:: map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index b9f5e809c0..fc296e7623 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Corridors_1F: @ 84844C4 +AbandonedShip_Corridors_1F: .4byte AbandonedShip_Corridors_1F_Layout .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 187 + .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 34bc41cf05..bbe3153e09 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -1,8 +1,8 @@ -AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 +AbandonedShip_Corridors_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 -AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 +AbandonedShip_Corridors_B1F_MapWarps: warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F @@ -12,9 +12,9 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 +AbandonedShip_Corridors_B1F_MapBGEvents: bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 -AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884 +AbandonedShip_Corridors_B1F_MapEvents:: map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 98f23c223a..7b03645fda 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Corridors_B1F: @ 84844FC +AbandonedShip_Corridors_B1F: .4byte AbandonedShip_Corridors_B1F_Layout .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 189 + .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc index 289f917af4..70fa72c4f7 100644 --- a/data/maps/AbandonedShip_Deck/events.inc +++ b/data/maps/AbandonedShip_Deck/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Deck_MapWarps: @ 8536684 +AbandonedShip_Deck_MapWarps: warp_def 13, 15, 3, 0, MAP_ROUTE108 warp_def 14, 15, 3, 0, MAP_ROUTE108 warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE -AbandonedShip_Deck_MapEvents:: @ 85366AC +AbandonedShip_Deck_MapEvents:: map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 394c93ec95..395f4404d6 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Deck: @ 84844A8 +AbandonedShip_Deck: .4byte AbandonedShip_Deck_Layout .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 186 + .2byte LAYOUT_ABANDONED_SHIP_DECK .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index 54453b7290..5b0130c3ef 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -1,4 +1,4 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC +AbandonedShip_HiddenFloorCorridors_MapWarps: warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS @@ -6,12 +6,12 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS -AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC +AbandonedShip_HiddenFloorCorridors_MapBGEvents: bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE -AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C +AbandonedShip_HiddenFloorCorridors_MapEvents:: map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index dcf42db40c..cc268ca6e0 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorCorridors: @ 84845DC +AbandonedShip_HiddenFloorCorridors: .4byte AbandonedShip_HiddenFloorCorridors_Layout .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 289 + .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index b2cf9b11bc..380e7f958b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 +AbandonedShip_HiddenFloorRooms_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE -AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 +AbandonedShip_HiddenFloorRooms_MapWarps: warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -15,7 +15,7 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS -AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 +AbandonedShip_HiddenFloorRooms_MapBGEvents: bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY @@ -27,6 +27,6 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 -AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 +AbandonedShip_HiddenFloorRooms_MapEvents:: map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index f279a52ab7..24889acd1f 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorRooms: @ 84845F8 +AbandonedShip_HiddenFloorRooms: .4byte AbandonedShip_HiddenFloorRooms_Layout .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 310 + .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index bd882d6d85..d0cddd45b5 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F_EventObjects: @ 853697C +AbandonedShip_Room_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 -AbandonedShip_Room_B1F_MapWarps: @ 8536994 +AbandonedShip_Room_B1F_MapWarps: warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Room_B1F_MapEvents:: @ 85369A4 +AbandonedShip_Room_B1F_MapEvents:: map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 3ac0c5f38a..c6dd8ee37d 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F: @ 848456C +AbandonedShip_Room_B1F: .4byte AbandonedShip_Room_B1F_Layout .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 193 + .2byte LAYOUT_ABANDONED_SHIP_ROOM_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index 6e4b9b2803..71b0416e37 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,15 +1,15 @@ -AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 +AbandonedShip_Rooms2_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 -AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 +AbandonedShip_Rooms2_1F_MapWarps: warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48 +AbandonedShip_Rooms2_1F_MapEvents:: map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 71f856bc06..e9a55f93e2 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms2_1F: @ 8484588 +AbandonedShip_Rooms2_1F: .4byte AbandonedShip_Rooms2_1F_Layout .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 194 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index 3bb29619aa..3c47ae3bb0 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,13 +1,13 @@ -AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 +AbandonedShip_Rooms2_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL -AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 +AbandonedShip_Rooms2_B1F_MapWarps: warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944 +AbandonedShip_Rooms2_B1F_MapEvents:: map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 943e57b77d..4afe519374 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms2_B1F: @ 8484534 +AbandonedShip_Rooms2_B1F: .4byte AbandonedShip_Rooms2_B1F_Layout .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 191 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index f0322558b0..b63f2bd72f 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_1F_EventObjects: @ 8536764 +AbandonedShip_Rooms_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 -AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 +AbandonedShip_Rooms_1F_MapWarps: warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F @@ -12,6 +12,6 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4 +AbandonedShip_Rooms_1F_MapEvents:: map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index b37456c281..60607565c3 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_1F: @ 84844E0 +AbandonedShip_Rooms_1F: .4byte AbandonedShip_Rooms_1F_Layout .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 188 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 4af246e5c0..eda95460bd 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,12 +1,12 @@ -AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 +AbandonedShip_Rooms_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE -AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 +AbandonedShip_Rooms_B1F_MapWarps: warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0 +AbandonedShip_Rooms_B1F_MapEvents:: map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index f5ec64f2b7..582123b345 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_B1F: @ 8484518 +AbandonedShip_Rooms_B1F: .4byte AbandonedShip_Rooms_B1F_Layout .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 190 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc index 5c9af3c107..c6c4e226fa 100644 --- a/data/maps/AbandonedShip_Underwater1/events.inc +++ b/data/maps/AbandonedShip_Underwater1/events.inc @@ -1,7 +1,7 @@ -AbandonedShip_Underwater1_MapWarps: @ 8536958 +AbandonedShip_Underwater1_MapWarps: warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 -AbandonedShip_Underwater1_MapEvents:: @ 8536968 +AbandonedShip_Underwater1_MapEvents:: map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index e5119887a7..d77b43cac4 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Underwater1: @ 8484550 +AbandonedShip_Underwater1: .4byte AbandonedShip_Underwater1_Layout .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 192 + .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER1 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc index f06c21b2a0..f4fadb1bae 100644 --- a/data/maps/AbandonedShip_Underwater2/events.inc +++ b/data/maps/AbandonedShip_Underwater2/events.inc @@ -1,6 +1,6 @@ -AbandonedShip_Underwater2_MapWarps: @ 8536AB0 +AbandonedShip_Underwater2_MapWarps: warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 -AbandonedShip_Underwater2_MapEvents:: @ 8536AB8 +AbandonedShip_Underwater2_MapEvents:: map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index de7e871d0b..eb08a5f709 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Underwater2: @ 84845C0 +AbandonedShip_Underwater2: .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 196 + .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER2 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc index 898038715d..0963e38015 100644 --- a/data/maps/AlteringCave/events.inc +++ b/data/maps/AlteringCave/events.inc @@ -1,6 +1,6 @@ -AlteringCave_MapWarps: @ 8537894 +AlteringCave_MapWarps: warp_def 18, 22, 0, 0, MAP_ROUTE103 -AlteringCave_MapEvents:: @ 853789C +AlteringCave_MapEvents:: map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index fe88dbca0c..551d704248 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -1,10 +1,10 @@ -AlteringCave: @ 8484A58 +AlteringCave: .4byte AlteringCave_Layout .4byte AlteringCave_MapEvents .4byte AlteringCave_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 420 + .2byte LAYOUT_ALTERING_CAVE .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 3e784dea26..06dedb33ed 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,16 +1,16 @@ -AncientTomb_EventObjects: @ 8536CDC +AncientTomb_EventObjects: object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL -AncientTomb_MapWarps: @ 8536CF4 +AncientTomb_MapWarps: warp_def 8, 29, 3, 0, MAP_ROUTE120 warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB -AncientTomb_MapBGEvents: @ 8536D0C +AncientTomb_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033 bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 -AncientTomb_MapEvents:: @ 8536D30 +AncientTomb_MapEvents:: map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5bfe546145..f1c3b4111d 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,10 +1,10 @@ -AncientTomb: @ 8484630 +AncientTomb: .4byte AncientTomb_Layout .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 281 + .2byte LAYOUT_ANCIENT_TOMB .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index 6a4f0972fa..663ae0ada0 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,13 +1,13 @@ -AquaHideout_1F_EventObjects: @ 8535304 +AquaHideout_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_1F_MapWarps: @ 853534C +AquaHideout_1F_MapWarps: warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F -AquaHideout_1F_MapEvents:: @ 8535364 +AquaHideout_1F_MapEvents:: map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index dd4e120437..30e045f797 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_1F: @ 8484144 +AquaHideout_1F: .4byte AquaHideout_1F_Layout .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 143 + .2byte LAYOUT_AQUA_HIDEOUT_1F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index 6dd83aebf3..edc3df4c64 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,4 +1,4 @@ -AquaHideout_B1F_EventObjects: @ 8535378 +AquaHideout_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR @@ -9,7 +9,7 @@ AquaHideout_B1F_EventObjects: @ 8535378 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_B1F_MapWarps: @ 8535450 +AquaHideout_B1F_MapWarps: warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F @@ -36,6 +36,6 @@ AquaHideout_B1F_MapWarps: @ 8535450 warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F -AquaHideout_B1F_MapEvents:: @ 8535518 +AquaHideout_B1F_MapEvents:: map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index bc65150d61..dfe453ddd4 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_B1F: @ 8484160 +AquaHideout_B1F: .4byte AquaHideout_B1F_Layout .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 144 + .2byte LAYOUT_AQUA_HIDEOUT_B1F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 552a95ad44..f24115c324 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,4 +1,4 @@ -AquaHideout_B2F_EventObjects: @ 853552C +AquaHideout_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL @@ -6,7 +6,7 @@ AquaHideout_B2F_EventObjects: @ 853552C object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_B2F_MapWarps: @ 85355BC +AquaHideout_B2F_MapWarps: warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F @@ -18,10 +18,10 @@ AquaHideout_B2F_MapWarps: @ 85355BC warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F -AquaHideout_B2F_MapCoordEvents: @ 853560C +AquaHideout_B2F_MapCoordEvents: coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 -AquaHideout_B2F_MapEvents:: @ 853562C +AquaHideout_B2F_MapEvents:: map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index d4bf343288..3d87c7ad3a 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_B2F: @ 848417C +AquaHideout_B2F: .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 145 + .2byte LAYOUT_AQUA_HIDEOUT_B2F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc index 45663b68fe..f8107f4795 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC +AquaHideout_UnusedRubyMap1_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 90e59a51e1..30946c6f8d 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap1: @ 84846D8 +AquaHideout_UnusedRubyMap1: .4byte AquaHideout_UnusedRubyMap1_Layout .4byte AquaHideout_UnusedRubyMap1_MapEvents .4byte AquaHideout_UnusedRubyMap1_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 316 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc index 6f53de284a..569e13cb09 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0 +AquaHideout_UnusedRubyMap2_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index 776465f16e..cd08fcc5e8 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap2: @ 84846F4 +AquaHideout_UnusedRubyMap2: .4byte AquaHideout_UnusedRubyMap2_Layout .4byte AquaHideout_UnusedRubyMap2_MapEvents .4byte AquaHideout_UnusedRubyMap2_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 317 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc index 8a23a37861..7618c0d58e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4 +AquaHideout_UnusedRubyMap3_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index ab97ae84d5..993f10aff9 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap3: @ 8484710 +AquaHideout_UnusedRubyMap3: .4byte AquaHideout_UnusedRubyMap3_Layout .4byte AquaHideout_UnusedRubyMap3_MapEvents .4byte AquaHideout_UnusedRubyMap3_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 318 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc index 30f920220a..f53e074b90 100644 --- a/data/maps/ArtisanCave_1F/events.inc +++ b/data/maps/ArtisanCave_1F/events.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F_EventObjects: @ 8537774 +ArtisanCave_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS -ArtisanCave_1F_MapWarps: @ 853778C +ArtisanCave_1F_MapWarps: warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F -ArtisanCave_1F_MapEvents:: @ 853779C +ArtisanCave_1F_MapEvents:: map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index c53a2851b4..670aa6845c 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F: @ 84849B0 +ArtisanCave_1F: .4byte ArtisanCave_1F_Layout .4byte ArtisanCave_1F_MapEvents .4byte ArtisanCave_1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 401 + .2byte LAYOUT_ARTISAN_CAVE_1F .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index 9df844aa37..7572aaa2ad 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -1,16 +1,16 @@ -ArtisanCave_B1F_EventObjects: @ 8537708 +ArtisanCave_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP -ArtisanCave_B1F_MapWarps: @ 8537720 +ArtisanCave_B1F_MapWarps: warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F -ArtisanCave_B1F_MapBGEvents: @ 8537730 +ArtisanCave_B1F_MapBGEvents: bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON -ArtisanCave_B1F_MapEvents:: @ 8537760 +ArtisanCave_B1F_MapEvents:: map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index f76fe69382..fd1adb32fc 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -1,10 +1,10 @@ -ArtisanCave_B1F: @ 8484994 +ArtisanCave_B1F: .4byte ArtisanCave_B1F_Layout .4byte ArtisanCave_B1F_MapEvents .4byte ArtisanCave_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 400 + .2byte LAYOUT_ARTISAN_CAVE_B1F .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc index 4731db9755..4d8b6ea2fc 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC +BattleFrontier_BattleArenaBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 @@ -9,6 +9,6 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 +BattleFrontier_BattleArenaBattleRoom_MapEvents:: map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 12962e7dec..1c4cf3eb07 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaBattleRoom: @ 8485484 +BattleFrontier_BattleArenaBattleRoom: .4byte BattleFrontier_BattleArenaBattleRoom_Layout .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 356 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc index bfe28c3393..5be3b04e6c 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 +BattleFrontier_BattleArenaCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 +BattleFrontier_BattleArenaCorridor_MapEvents:: map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index d4935ea9ef..17341a3e86 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaCorridor: @ 8485468 +BattleFrontier_BattleArenaCorridor: .4byte BattleFrontier_BattleArenaCorridor_Layout .4byte BattleFrontier_BattleArenaCorridor_MapEvents .4byte BattleFrontier_BattleArenaCorridor_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 355 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc index e20bec9c33..a63202848b 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -1,17 +1,17 @@ -BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 +BattleFrontier_BattleArenaLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 -BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C +BattleFrontier_BattleArenaLobby_MapWarps: warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 +BattleFrontier_BattleArenaLobby_MapBGEvents: bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092 bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA -BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC +BattleFrontier_BattleArenaLobby_MapEvents:: map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 3523eaf63f..db8f456ff3 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaLobby: @ 848544C +BattleFrontier_BattleArenaLobby: .4byte BattleFrontier_BattleArenaLobby_Layout .4byte BattleFrontier_BattleArenaLobby_MapEvents .4byte BattleFrontier_BattleArenaLobby_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 354 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc index 9101606456..ce8f66f6bf 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 +BattleFrontier_BattleDomeBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 @@ -15,6 +15,6 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C +BattleFrontier_BattleDomeBattleRoom_MapEvents:: map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 7d2119ebee..593adeb6f3 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeBattleRoom: @ 8485388 +BattleFrontier_BattleDomeBattleRoom: .4byte BattleFrontier_BattleDomeBattleRoom_Layout .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_DOME - .2byte 335 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc index 6bce917a01..3d3f5be4bd 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C +BattleFrontier_BattleDomeCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 +BattleFrontier_BattleDomeCorridor_MapWarps: warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174 +BattleFrontier_BattleDomeCorridor_MapEvents:: map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 25883e9ed5..3ce5b2b5e0 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor: @ 8485350 +BattleFrontier_BattleDomeCorridor: .4byte BattleFrontier_BattleDomeCorridor_Layout .4byte BattleFrontier_BattleDomeCorridor_MapEvents .4byte BattleFrontier_BattleDomeCorridor_MapScripts .4byte 0x0 .2byte MUS_B_DOME1 - .2byte 333 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc index cce01feda6..abf8671326 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 +BattleFrontier_BattleDomeLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 @@ -6,16 +6,16 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 -BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 +BattleFrontier_BattleDomeLobby_MapWarps: warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 +BattleFrontier_BattleDomeLobby_MapBGEvents: bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52 bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84 bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34 -BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 +BattleFrontier_BattleDomeLobby_MapEvents:: map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 451192a452..cf0c576191 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeLobby: @ 8485334 +BattleFrontier_BattleDomeLobby: .4byte BattleFrontier_BattleDomeLobby_Layout .4byte BattleFrontier_BattleDomeLobby_MapEvents .4byte BattleFrontier_BattleDomeLobby_MapScripts .4byte 0x0 .2byte MUS_B_DOME1 - .2byte 332 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc index 559199b292..0714b7b68d 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 +BattleFrontier_BattleDomePreBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 +BattleFrontier_BattleDomePreBattleRoom_MapWarps: warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0 +BattleFrontier_BattleDomePreBattleRoom_MapEvents:: map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 59b5b15e4a..84637906d8 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom: @ 848536C +BattleFrontier_BattleDomePreBattleRoom: .4byte BattleFrontier_BattleDomePreBattleRoom_Layout .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_DOME - .2byte 334 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc index bdaf4c51bb..5f3a6a218e 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC +BattleFrontier_BattleFactoryBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 @@ -8,6 +8,6 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C +BattleFrontier_BattleFactoryBattleRoom_MapEvents:: map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 960fef2eb4..cb20b3f1ee 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 +BattleFrontier_BattleFactoryBattleRoom: .4byte BattleFrontier_BattleFactoryBattleRoom_Layout .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 348 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc index 063f498131..7cfccd0ff5 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 +BattleFrontier_BattleFactoryLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 @@ -6,15 +6,15 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 -BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 +BattleFrontier_BattleFactoryLobby_MapWarps: warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 +BattleFrontier_BattleFactoryLobby_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839 -BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C +BattleFrontier_BattleFactoryLobby_MapEvents:: map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 92329c6ef5..30bd38b686 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryLobby: @ 84854A0 +BattleFrontier_BattleFactoryLobby: .4byte BattleFrontier_BattleFactoryLobby_Layout .4byte BattleFrontier_BattleFactoryLobby_MapEvents .4byte BattleFrontier_BattleFactoryLobby_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 346 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc index d341250dee..944ff81429 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 +BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 +BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 4cae9ed0c7..ecbfc37a97 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC +BattleFrontier_BattleFactoryPreBattleRoom: .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 347 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc index 8363f2bb57..95aacea959 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC +BattleFrontier_BattlePalaceBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 +BattleFrontier_BattlePalaceBattleRoom_MapWarps: warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR -BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584 +BattleFrontier_BattlePalaceBattleRoom_MapEvents:: map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 2715ade5c7..035cd8758e 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceBattleRoom: @ 84853DC +BattleFrontier_BattlePalaceBattleRoom: .4byte BattleFrontier_BattlePalaceBattleRoom_Layout .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 344 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc index 66e844665a..578c2cc436 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 +BattleFrontier_BattlePalaceCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 @@ -7,12 +7,12 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0 -BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 +BattleFrontier_BattlePalaceCorridor_MapWarps: warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM -BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8 +BattleFrontier_BattlePalaceCorridor_MapEvents:: map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index f2866b9b0d..6d2f8ffb05 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceCorridor: @ 84853C0 +BattleFrontier_BattlePalaceCorridor: .4byte BattleFrontier_BattlePalaceCorridor_Layout .4byte BattleFrontier_BattlePalaceCorridor_MapEvents .4byte BattleFrontier_BattlePalaceCorridor_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 343 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc index 632bfdf107..4c2d924b2f 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 +BattleFrontier_BattlePalaceLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 @@ -6,16 +6,16 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 -BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 +BattleFrontier_BattlePalaceLobby_MapWarps: warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR -BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 +BattleFrontier_BattlePalaceLobby_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 -BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C +BattleFrontier_BattlePalaceLobby_MapEvents:: map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 19d06e0be6..8846982cf4 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceLobby: @ 84853A4 +BattleFrontier_BattlePalaceLobby: .4byte BattleFrontier_BattlePalaceLobby_Layout .4byte BattleFrontier_BattlePalaceLobby_MapEvents .4byte BattleFrontier_BattlePalaceLobby_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 342 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc index b34916f49e..ace2657bbc 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 +BattleFrontier_BattlePikeCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C +BattleFrontier_BattlePikeCorridor_MapEvents:: map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 07d7305798..cecd6fba15 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeCorridor: @ 8485510 +BattleFrontier_BattlePikeCorridor: .4byte BattleFrontier_BattlePikeCorridor_Layout .4byte BattleFrontier_BattlePikeCorridor_MapEvents .4byte BattleFrontier_BattlePikeCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 350 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc index 495d522579..b28d48d6ac 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -1,18 +1,18 @@ -BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 +BattleFrontier_BattlePikeLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 -BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 +BattleFrontier_BattlePikeLobby_MapWarps: warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 +BattleFrontier_BattlePikeLobby_MapBGEvents: bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80 bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 -BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40 +BattleFrontier_BattlePikeLobby_MapEvents:: map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index e591be668f..a3746c1143 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeLobby: @ 84854F4 +BattleFrontier_BattlePikeLobby: .4byte BattleFrontier_BattlePikeLobby_Layout .4byte BattleFrontier_BattlePikeLobby_MapEvents .4byte BattleFrontier_BattlePikeLobby_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 349 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc index 81dee29d15..34f802c916 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 +BattleFrontier_BattlePikeRandomRoom1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 -BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 +BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D @@ -11,6 +11,6 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D -BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 +BattleFrontier_BattlePikeRandomRoom1_MapEvents:: map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index d49bb07d5d..ff61d12384 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom1: @ 8485548 +BattleFrontier_BattlePikeRandomRoom1: .4byte BattleFrontier_BattlePikeRandomRoom1_Layout .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 352 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc index 41a58ad3b6..0d929a2ae3 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 +BattleFrontier_BattlePikeRandomRoom2_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 +BattleFrontier_BattlePikeRandomRoom2_MapEvents:: map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 506a31496b..6ab11ae02e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom2: @ 8485564 +BattleFrontier_BattlePikeRandomRoom2: .4byte BattleFrontier_BattlePikeRandomRoom2_Layout .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 353 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc index 61cb8ede48..9b3a6234e0 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 +BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 @@ -7,6 +7,6 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D -BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 +BattleFrontier_BattlePikeRandomRoom3_MapEvents:: map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 3f5607922d..fabb3a8ef7 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom3: @ 8485580 +BattleFrontier_BattlePikeRandomRoom3: .4byte BattleFrontier_BattlePikeRandomRoom3_Layout .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 358 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index 2fc9e9d6c9..59abdb9708 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 +BattleFrontier_BattlePikeThreePathRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 +BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 @@ -13,6 +13,6 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 +BattleFrontier_BattlePikeThreePathRoom_MapEvents:: map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 9743a7c365..718d5d3e60 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeThreePathRoom: @ 848552C +BattleFrontier_BattlePikeThreePathRoom: .4byte BattleFrontier_BattlePikeThreePathRoom_Layout .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 351 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc index 225961050f..3c8e0fda8f 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 +BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 @@ -9,11 +9,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 -BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 +BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108 +BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 831a39d2a5..c60cf97f26 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 +BattleFrontier_BattlePointExchangeServiceCorner: .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 398 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc index f9604d8d16..793434de3e 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C +BattleFrontier_BattlePyramidEmptySquare_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 @@ -16,6 +16,6 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC +BattleFrontier_BattlePyramidEmptySquare_MapEvents:: map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index ef5c8409f8..46b22aa7aa 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidEmptySquare: @ 8485414 +BattleFrontier_BattlePyramidEmptySquare: .4byte BattleFrontier_BattlePyramidEmptySquare_Layout .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts .4byte 0x0 .2byte 65535 - .2byte 361 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index b70958fecd..81a4203b5a 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -1,16 +1,16 @@ -BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 +BattleFrontier_BattlePyramidLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 -BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 +BattleFrontier_BattlePyramidLobby_MapWarps: warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 +BattleFrontier_BattlePyramidLobby_MapBGEvents: bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 -BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 +BattleFrontier_BattlePyramidLobby_MapEvents:: map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 91d454fbe4..f8e7408a02 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidLobby: @ 84853F8 +BattleFrontier_BattlePyramidLobby: .4byte BattleFrontier_BattlePyramidLobby_Layout .4byte BattleFrontier_BattlePyramidLobby_MapEvents .4byte BattleFrontier_BattlePyramidLobby_MapScripts .4byte 0x0 .2byte MUS_PYRAMID - .2byte 360 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index fbf4941ca2..9e1cd9f4f5 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 +BattleFrontier_BattlePyramidTop_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 +BattleFrontier_BattlePyramidTop_MapCoordEvents: coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 -BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 +BattleFrontier_BattlePyramidTop_MapEvents:: map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index d58e1fe81e..e2e8ec59a6 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop: @ 8485430 +BattleFrontier_BattlePyramidTop: .4byte BattleFrontier_BattlePyramidTop_Layout .4byte BattleFrontier_BattlePyramidTop_MapEvents .4byte BattleFrontier_BattlePyramidTop_MapScripts .4byte 0x0 .2byte 65535 - .2byte 378 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc index 148e590af6..4de7382b23 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc @@ -1,12 +1,12 @@ -BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 +BattleFrontier_BattleTowerBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 +BattleFrontier_BattleTowerBattleRoom_MapWarps: warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY -BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828 +BattleFrontier_BattleTowerBattleRoom_MapEvents:: map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 5aa95a63e8..5f8b03ace3 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerBattleRoom: @ 848521C +BattleFrontier_BattleTowerBattleRoom: .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 268 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc index f83bee69de..97dc0c8570 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 +BattleFrontier_BattleTowerBattleRoom2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 @@ -6,6 +6,6 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 +BattleFrontier_BattleTowerBattleRoom2_MapEvents:: map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 34a8fae84e..464ed85666 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerBattleRoom2: @ 8485318 +BattleFrontier_BattleTowerBattleRoom2: .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 268 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc index ae3ca25754..80b239fbcd 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 +BattleFrontier_BattleTowerCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC +BattleFrontier_BattleTowerCorridor_MapEvents:: map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 8d920a8c8b..7774e0f3bd 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerCorridor: @ 8485200 +BattleFrontier_BattleTowerCorridor: .4byte BattleFrontier_BattleTowerCorridor_Layout .4byte BattleFrontier_BattleTowerCorridor_MapEvents .4byte BattleFrontier_BattleTowerCorridor_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 267 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc index f96f149162..726c4b58aa 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc @@ -1,9 +1,9 @@ -BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 +BattleFrontier_BattleTowerCorridor2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 +BattleFrontier_BattleTowerCorridor2_MapEvents:: map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 66255315f4..9a8676f937 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerCorridor2: @ 84852FC +BattleFrontier_BattleTowerCorridor2: .4byte BattleFrontier_BattleTowerCorridor2_Layout .4byte BattleFrontier_BattleTowerCorridor2_MapEvents .4byte BattleFrontier_BattleTowerCorridor2_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 391 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc index 671d6d4342..a33f30c9e0 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 +BattleFrontier_BattleTowerElevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 +BattleFrontier_BattleTowerElevator_MapEvents:: map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index f8d9ff8538..3267daa20d 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerElevator: @ 84851E4 +BattleFrontier_BattleTowerElevator: .4byte BattleElevator_Layout .4byte BattleFrontier_BattleTowerElevator_MapEvents .4byte BattleFrontier_BattleTowerElevator_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 266 + .2byte LAYOUT_BATTLE_ELEVATOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index 6a78eaee69..ddf573eb2d 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 +BattleFrontier_BattleTowerLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 @@ -9,18 +9,18 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 -BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 +BattleFrontier_BattleTowerLobby_MapWarps: warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM -BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 +BattleFrontier_BattleTowerLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012 bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE -BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 +BattleFrontier_BattleTowerLobby_MapEvents:: map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 989bffe9b6..b1ca3914a0 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerLobby: @ 84851C8 +BattleFrontier_BattleTowerLobby: .4byte BattleFrontier_BattleTowerLobby_Layout .4byte BattleFrontier_BattleTowerLobby_MapEvents .4byte BattleFrontier_BattleTowerLobby_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 264 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc index 9f3977075e..d7dfcd3ad2 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 +BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 @@ -9,6 +9,6 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 -BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C +BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 23a792934b..d8fc1abb69 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 +BattleFrontier_BattleTowerMultiBattleRoom: .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 390 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc index 78ef441098..7fb5e62565 100644 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ b/data/maps/BattleFrontier_Lounge1/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge1_EventObjects: @ 853CFB4 +BattleFrontier_Lounge1_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 -BattleFrontier_Lounge1_MapWarps: @ 853CFFC +BattleFrontier_Lounge1_MapWarps: warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge1_MapEvents:: @ 853D004 +BattleFrontier_Lounge1_MapEvents:: map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 58caac9039..69119443dd 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge1: @ 84855B8 +BattleFrontier_Lounge1: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge1_MapEvents .4byte BattleFrontier_Lounge1_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc index cc32ddf425..faa0a5608b 100644 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_Lounge2_EventObjects: @ 853D11C +BattleFrontier_Lounge2_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 -BattleFrontier_Lounge2_MapWarps: @ 853D194 +BattleFrontier_Lounge2_MapWarps: warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 +BattleFrontier_Lounge2_MapEvents:: map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index effcc53bda..a74f85ca41 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge2: @ 84855F0 +BattleFrontier_Lounge2: .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 397 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc index bce1dfa35f..f8a26e4ddc 100644 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ b/data/maps/BattleFrontier_Lounge3/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge3_EventObjects: @ 853D1B8 +BattleFrontier_Lounge3_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 -BattleFrontier_Lounge3_MapWarps: @ 853D230 +BattleFrontier_Lounge3_MapWarps: warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge3_MapEvents:: @ 853D238 +BattleFrontier_Lounge3_MapEvents:: map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index d6867551e8..fb27b1580c 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge3: @ 848560C +BattleFrontier_Lounge3: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge3_MapEvents .4byte BattleFrontier_Lounge3_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc index 8b86bebc7f..c2e2f44a26 100644 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ b/data/maps/BattleFrontier_Lounge4/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge4_EventObjects: @ 853D24C +BattleFrontier_Lounge4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 -BattleFrontier_Lounge4_MapWarps: @ 853D294 +BattleFrontier_Lounge4_MapWarps: warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge4_MapEvents:: @ 853D29C +BattleFrontier_Lounge4_MapEvents:: map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 912cc41ff6..edb6171e79 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge4: @ 8485628 +BattleFrontier_Lounge4: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge4_MapEvents .4byte BattleFrontier_Lounge4_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc index 216a72473e..e0a2ea3447 100644 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ b/data/maps/BattleFrontier_Lounge5/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge5_EventObjects: @ 853D2EC +BattleFrontier_Lounge5_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 -BattleFrontier_Lounge5_MapWarps: @ 853D34C +BattleFrontier_Lounge5_MapWarps: warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge5_MapEvents:: @ 853D35C +BattleFrontier_Lounge5_MapEvents:: map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index a6febc0c86..9c9de0e3b9 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge5: @ 8485660 +BattleFrontier_Lounge5: .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge5_MapEvents .4byte BattleFrontier_Lounge5_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 397 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc index 24d7958ec4..8c3950d61a 100644 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ b/data/maps/BattleFrontier_Lounge6/events.inc @@ -1,9 +1,9 @@ -BattleFrontier_Lounge6_EventObjects: @ 853D370 +BattleFrontier_Lounge6_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 -BattleFrontier_Lounge6_MapWarps: @ 853D388 +BattleFrontier_Lounge6_MapWarps: warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge6_MapEvents:: @ 853D390 +BattleFrontier_Lounge6_MapEvents:: map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index 151890a147..2b5f8474f3 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge6: @ 848567C +BattleFrontier_Lounge6: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge6_MapEvents .4byte BattleFrontier_Lounge6_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc index de4aef12aa..bc7f289adc 100644 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ b/data/maps/BattleFrontier_Lounge7/events.inc @@ -1,12 +1,12 @@ -BattleFrontier_Lounge7_EventObjects: @ 853D3A4 +BattleFrontier_Lounge7_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 -BattleFrontier_Lounge7_MapWarps: @ 853D404 +BattleFrontier_Lounge7_MapWarps: warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge7_MapEvents:: @ 853D40C +BattleFrontier_Lounge7_MapEvents:: map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 061d2102c8..58b9dc3e5b 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge7: @ 8485698 +BattleFrontier_Lounge7: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge7_MapEvents .4byte BattleFrontier_Lounge7_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc index c8edc68aad..47e8e51f1d 100644 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ b/data/maps/BattleFrontier_Lounge8/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge8_EventObjects: @ 853D4BC +BattleFrontier_Lounge8_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 -BattleFrontier_Lounge8_MapWarps: @ 853D504 +BattleFrontier_Lounge8_MapWarps: warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge8_MapEvents:: @ 853D50C +BattleFrontier_Lounge8_MapEvents:: map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index e1b319e1d5..578219cc4f 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge8: @ 84856D0 +BattleFrontier_Lounge8: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge8_MapEvents .4byte BattleFrontier_Lounge8_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc index 6598e0229e..ce86367cf8 100644 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ b/data/maps/BattleFrontier_Lounge9/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9_EventObjects: @ 853D520 +BattleFrontier_Lounge9_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_Lounge9_MapWarps: @ 853D538 +BattleFrontier_Lounge9_MapWarps: warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge9_MapEvents:: @ 853D548 +BattleFrontier_Lounge9_MapEvents:: map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 916feb5699..32b1512efd 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9: @ 84856EC +BattleFrontier_Lounge9: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge9_MapEvents .4byte BattleFrontier_Lounge9_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc index 9e57319f07..e637b489b5 100644 --- a/data/maps/BattleFrontier_Mart/events.inc +++ b/data/maps/BattleFrontier_Mart/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Mart_EventObjects: @ 853D68C +BattleFrontier_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 -BattleFrontier_Mart_MapWarps: @ 853D6EC +BattleFrontier_Mart_MapWarps: warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Mart_MapEvents:: @ 853D6FC +BattleFrontier_Mart_MapEvents:: map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 7dcfb9d33e..97251160fd 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Mart: @ 8485740 +BattleFrontier_Mart: .4byte Mart_Layout .4byte BattleFrontier_Mart_MapEvents .4byte BattleFrontier_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc index 5a2d13f7f4..e042da23e8 100644 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ b/data/maps/BattleFrontier_OutsideEast/connections.inc @@ -1,7 +1,7 @@ -BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4 +BattleFrontier_OutsideEast_MapConnectionsList: connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_OutsideEast_MapConnections: @ 8486EF0 - .4byte 0x1 +BattleFrontier_OutsideEast_MapConnections: + .4byte 1 .4byte BattleFrontier_OutsideEast_MapConnectionsList diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index a16bca779d..b5ee58e49a 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_OutsideEast_EventObjects: @ 853BB10 +BattleFrontier_OutsideEast_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 @@ -26,7 +26,7 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 -BattleFrontier_OutsideEast_MapWarps: @ 853BD80 +BattleFrontier_OutsideEast_MapWarps: warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @@ -42,7 +42,7 @@ BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F -BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 +BattleFrontier_OutsideEast_MapBGEvents: bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43 bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55 @@ -52,6 +52,6 @@ BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 -BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 +BattleFrontier_OutsideEast_MapEvents:: map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index b67df4029b..72e10d0dd9 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_OutsideEast: @ 84852C4 +BattleFrontier_OutsideEast: .4byte BattleFrontier_OutsideEast_Layout .4byte BattleFrontier_OutsideEast_MapEvents .4byte BattleFrontier_OutsideEast_MapScripts .4byte BattleFrontier_OutsideEast_MapConnections .2byte MUS_B_FRONTIER - .2byte 345 + .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc index 1d20172f2b..0755b3c44c 100644 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ b/data/maps/BattleFrontier_OutsideWest/connections.inc @@ -1,7 +1,7 @@ -BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0 +BattleFrontier_OutsideWest_MapConnectionsList: connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_OutsideWest_MapConnections: @ 8486EDC - .4byte 0x1 +BattleFrontier_OutsideWest_MapConnections: + .4byte 1 .4byte BattleFrontier_OutsideWest_MapConnectionsList diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc index de372832f9..87c0db7aab 100644 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_OutsideWest_EventObjects: @ 853B350 +BattleFrontier_OutsideWest_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 @@ -24,7 +24,7 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 -BattleFrontier_OutsideWest_MapWarps: @ 853B590 +BattleFrontier_OutsideWest_MapWarps: warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY @@ -37,13 +37,13 @@ BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F -BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 +BattleFrontier_OutsideWest_MapBGEvents: bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2 bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4 bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A -BattleFrontier_OutsideWest_MapEvents:: @ 853B624 +BattleFrontier_OutsideWest_MapEvents:: map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 312c1961ab..40f26c1518 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_OutsideWest: @ 84851AC +BattleFrontier_OutsideWest: .4byte BattleFrontier_OutsideWest_Layout .4byte BattleFrontier_OutsideWest_MapEvents .4byte BattleFrontier_OutsideWest_MapScripts .4byte BattleFrontier_OutsideWest_MapConnections .2byte MUS_B_FRONTIER - .2byte 265 + .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc index 5f2782f0f4..20bad9c6da 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C +BattleFrontier_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 -BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 +BattleFrontier_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F -BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC +BattleFrontier_PokemonCenter_1F_MapEvents:: map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index dcf26742c0..65445c2a17 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_PokemonCenter_1F: @ 8485708 +BattleFrontier_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte BattleFrontier_PokemonCenter_1F_MapEvents .4byte BattleFrontier_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc index 75bd2ebbbb..d2f3730e89 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 +BattleFrontier_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 +BattleFrontier_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 +BattleFrontier_PokemonCenter_2F_MapEvents:: map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 6bcff1234b..fbd39cde9e 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_PokemonCenter_2F: @ 8485724 +BattleFrontier_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index abec40c178..30a0e5ebb3 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_RankingHall_EventObjects: @ 853CEB8 +BattleFrontier_RankingHall_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 -BattleFrontier_RankingHall_MapWarps: @ 853CF00 +BattleFrontier_RankingHall_MapWarps: warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 +BattleFrontier_RankingHall_MapBGEvents: bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 @@ -21,6 +21,6 @@ BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 -BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 +BattleFrontier_RankingHall_MapEvents:: map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 03d9e36222..0f001d5637 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_RankingHall: @ 848559C +BattleFrontier_RankingHall: .4byte BattleFrontier_RankingHall_Layout .4byte BattleFrontier_RankingHall_MapEvents .4byte BattleFrontier_RankingHall_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 396 + .2byte LAYOUT_BATTLE_FRONTIER_RANKING_HALL .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc index 551cb802ff..c1e55ad870 100644 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_ReceptionGate_EventObjects: @ 853D420 +BattleFrontier_ReceptionGate_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 -BattleFrontier_ReceptionGate_MapWarps: @ 853D498 +BattleFrontier_ReceptionGate_MapWarps: warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8 +BattleFrontier_ReceptionGate_MapEvents:: map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 099ab38e14..46a55a6b1c 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_ReceptionGate: @ 84856B4 +BattleFrontier_ReceptionGate: .4byte BattleFrontier_ReceptionGate_Layout .4byte BattleFrontier_ReceptionGate_MapEvents .4byte BattleFrontier_ReceptionGate_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 399 + .2byte LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc index 3f4dcff869..acb02c4d8f 100644 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ b/data/maps/BattleFrontier_ScottsHouse/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 +BattleFrontier_ScottsHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 -BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 +BattleFrontier_ScottsHouse_MapWarps: warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8 +BattleFrontier_ScottsHouse_MapEvents:: map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index fe55f82726..ff41a82e33 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse: @ 8485644 +BattleFrontier_ScottsHouse: .4byte BattleFrontier_ScottsHouse_Layout .4byte BattleFrontier_ScottsHouse_MapEvents .4byte BattleFrontier_ScottsHouse_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 430 + .2byte LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc index cf5cfc1af5..bcc81b36cc 100644 --- a/data/maps/BattlePyramidSquare01/events.inc +++ b/data/maps/BattlePyramidSquare01/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare01_EventObjects: @ 853A460 +BattlePyramidSquare01_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare01_EventObjects: @ 853A460 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare01_MapEvents:: @ 853A508 +BattlePyramidSquare01_MapEvents:: map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index d9105ed4aa..e63919e43e 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare01: @ 8484F60 +BattlePyramidSquare01: .4byte BattlePyramidSquare01_Layout .4byte BattlePyramidSquare01_MapEvents .4byte BattlePyramidSquare01_MapScripts .4byte 0x0 .2byte 65535 - .2byte 362 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE01 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc index ad621d684e..978c559825 100644 --- a/data/maps/BattlePyramidSquare02/events.inc +++ b/data/maps/BattlePyramidSquare02/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare02_EventObjects: @ 853A51C +BattlePyramidSquare02_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare02_EventObjects: @ 853A51C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare02_MapEvents:: @ 853A5C4 +BattlePyramidSquare02_MapEvents:: map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index cebb14906e..61a1272cf4 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare02: @ 8484F7C +BattlePyramidSquare02: .4byte BattlePyramidSquare02_Layout .4byte BattlePyramidSquare02_MapEvents .4byte BattlePyramidSquare02_MapScripts .4byte 0x0 .2byte 65535 - .2byte 363 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE02 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc index 8eb81b96ad..339010e8a3 100644 --- a/data/maps/BattlePyramidSquare03/events.inc +++ b/data/maps/BattlePyramidSquare03/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare03_EventObjects: @ 853A5D8 +BattlePyramidSquare03_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare03_MapEvents:: @ 853A680 +BattlePyramidSquare03_MapEvents:: map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 389cd65387..ef7663ed0c 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare03: @ 8484F98 +BattlePyramidSquare03: .4byte BattlePyramidSquare03_Layout .4byte BattlePyramidSquare03_MapEvents .4byte BattlePyramidSquare03_MapScripts .4byte 0x0 .2byte 65535 - .2byte 364 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE03 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc index 79caf09ff5..4c4cf7df10 100644 --- a/data/maps/BattlePyramidSquare04/events.inc +++ b/data/maps/BattlePyramidSquare04/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare04_EventObjects: @ 853A694 +BattlePyramidSquare04_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare04_EventObjects: @ 853A694 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare04_MapEvents:: @ 853A73C +BattlePyramidSquare04_MapEvents:: map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 3b09fce2e6..7525f2b047 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare04: @ 8484FB4 +BattlePyramidSquare04: .4byte BattlePyramidSquare04_Layout .4byte BattlePyramidSquare04_MapEvents .4byte BattlePyramidSquare04_MapScripts .4byte 0x0 .2byte 65535 - .2byte 365 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE04 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc index 472178c56b..fe794509b2 100644 --- a/data/maps/BattlePyramidSquare05/events.inc +++ b/data/maps/BattlePyramidSquare05/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare05_EventObjects: @ 853A750 +BattlePyramidSquare05_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare05_EventObjects: @ 853A750 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare05_MapEvents:: @ 853A7F8 +BattlePyramidSquare05_MapEvents:: map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index ec6eff68c6..673d29e253 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare05: @ 8484FD0 +BattlePyramidSquare05: .4byte BattlePyramidSquare05_Layout .4byte BattlePyramidSquare05_MapEvents .4byte BattlePyramidSquare05_MapScripts .4byte 0x0 .2byte 65535 - .2byte 366 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE05 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc index 3363f6d43d..a7a1776e74 100644 --- a/data/maps/BattlePyramidSquare06/events.inc +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare06_EventObjects: @ 853A80C +BattlePyramidSquare06_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare06_EventObjects: @ 853A80C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare06_MapEvents:: @ 853A8B4 +BattlePyramidSquare06_MapEvents:: map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 7890c30886..2487c4a94b 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare06: @ 8484FEC +BattlePyramidSquare06: .4byte BattlePyramidSquare06_Layout .4byte BattlePyramidSquare06_MapEvents .4byte BattlePyramidSquare06_MapScripts .4byte 0x0 .2byte 65535 - .2byte 367 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc index 8d63fc4e13..85e9876264 100644 --- a/data/maps/BattlePyramidSquare07/events.inc +++ b/data/maps/BattlePyramidSquare07/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare07_EventObjects: @ 853A8C8 +BattlePyramidSquare07_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare07_EventObjects: @ 853A8C8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare07_MapEvents:: @ 853A970 +BattlePyramidSquare07_MapEvents:: map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 7f1bb51f1e..aa31ddcb0a 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare07: @ 8485008 +BattlePyramidSquare07: .4byte BattlePyramidSquare07_Layout .4byte BattlePyramidSquare07_MapEvents .4byte BattlePyramidSquare07_MapScripts .4byte 0x0 .2byte 65535 - .2byte 368 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE07 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc index 77ed5da6bd..dac62da218 100644 --- a/data/maps/BattlePyramidSquare08/events.inc +++ b/data/maps/BattlePyramidSquare08/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare08_EventObjects: @ 853A984 +BattlePyramidSquare08_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare08_EventObjects: @ 853A984 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare08_MapEvents:: @ 853AA2C +BattlePyramidSquare08_MapEvents:: map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index a5d6415198..f579f958ba 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare08: @ 8485024 +BattlePyramidSquare08: .4byte BattlePyramidSquare08_Layout .4byte BattlePyramidSquare08_MapEvents .4byte BattlePyramidSquare08_MapScripts .4byte 0x0 .2byte 65535 - .2byte 369 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE08 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc index 0fd84a8c54..17a4a1e383 100644 --- a/data/maps/BattlePyramidSquare09/events.inc +++ b/data/maps/BattlePyramidSquare09/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare09_EventObjects: @ 853AA40 +BattlePyramidSquare09_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare09_EventObjects: @ 853AA40 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare09_MapEvents:: @ 853AAE8 +BattlePyramidSquare09_MapEvents:: map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index d396c65a66..6dac1b9fe9 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare09: @ 8485040 +BattlePyramidSquare09: .4byte BattlePyramidSquare09_Layout .4byte BattlePyramidSquare09_MapEvents .4byte BattlePyramidSquare09_MapScripts .4byte 0x0 .2byte 65535 - .2byte 370 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE09 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc index b697a7d026..f172155f9f 100644 --- a/data/maps/BattlePyramidSquare10/events.inc +++ b/data/maps/BattlePyramidSquare10/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare10_EventObjects: @ 853AAFC +BattlePyramidSquare10_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare10_EventObjects: @ 853AAFC object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare10_MapEvents:: @ 853ABA4 +BattlePyramidSquare10_MapEvents:: map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 254c24708d..ac899c718b 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare10: @ 848505C +BattlePyramidSquare10: .4byte BattlePyramidSquare10_Layout .4byte BattlePyramidSquare10_MapEvents .4byte BattlePyramidSquare10_MapScripts .4byte 0x0 .2byte 65535 - .2byte 371 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE10 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc index e90e691e53..60c5e0e2de 100644 --- a/data/maps/BattlePyramidSquare11/events.inc +++ b/data/maps/BattlePyramidSquare11/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare11_EventObjects: @ 853ABB8 +BattlePyramidSquare11_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare11_EventObjects: @ 853ABB8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare11_MapEvents:: @ 853AC60 +BattlePyramidSquare11_MapEvents:: map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 765b74a0ad..ca560a4a70 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare11: @ 8485078 +BattlePyramidSquare11: .4byte BattlePyramidSquare11_Layout .4byte BattlePyramidSquare11_MapEvents .4byte BattlePyramidSquare11_MapScripts .4byte 0x0 .2byte 65535 - .2byte 372 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE11 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc index cad871e8d2..7c650b972c 100644 --- a/data/maps/BattlePyramidSquare12/events.inc +++ b/data/maps/BattlePyramidSquare12/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare12_EventObjects: @ 853AC74 +BattlePyramidSquare12_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare12_EventObjects: @ 853AC74 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare12_MapEvents:: @ 853AD1C +BattlePyramidSquare12_MapEvents:: map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index e81801a353..59793abe7e 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare12: @ 8485094 +BattlePyramidSquare12: .4byte BattlePyramidSquare12_Layout .4byte BattlePyramidSquare12_MapEvents .4byte BattlePyramidSquare12_MapScripts .4byte 0x0 .2byte 65535 - .2byte 373 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE12 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc index af56598c3f..90d427f2dc 100644 --- a/data/maps/BattlePyramidSquare13/events.inc +++ b/data/maps/BattlePyramidSquare13/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare13_EventObjects: @ 853AD30 +BattlePyramidSquare13_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare13_EventObjects: @ 853AD30 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare13_MapEvents:: @ 853ADD8 +BattlePyramidSquare13_MapEvents:: map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 356063c357..d0012926c5 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare13: @ 84850B0 +BattlePyramidSquare13: .4byte BattlePyramidSquare13_Layout .4byte BattlePyramidSquare13_MapEvents .4byte BattlePyramidSquare13_MapScripts .4byte 0x0 .2byte 65535 - .2byte 374 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE13 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc index f2d28d456c..80f28a83ab 100644 --- a/data/maps/BattlePyramidSquare14/events.inc +++ b/data/maps/BattlePyramidSquare14/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare14_EventObjects: @ 853ADEC +BattlePyramidSquare14_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare14_EventObjects: @ 853ADEC object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare14_MapEvents:: @ 853AE94 +BattlePyramidSquare14_MapEvents:: map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 76ae3925cd..049d9ec94d 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare14: @ 84850CC +BattlePyramidSquare14: .4byte BattlePyramidSquare14_Layout .4byte BattlePyramidSquare14_MapEvents .4byte BattlePyramidSquare14_MapScripts .4byte 0x0 .2byte 65535 - .2byte 375 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE14 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc index 2556030e3b..3781ec3dbf 100644 --- a/data/maps/BattlePyramidSquare15/events.inc +++ b/data/maps/BattlePyramidSquare15/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare15_EventObjects: @ 853AEA8 +BattlePyramidSquare15_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare15_EventObjects: @ 853AEA8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare15_MapEvents:: @ 853AF50 +BattlePyramidSquare15_MapEvents:: map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 57e45e1b2b..980402c21b 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare15: @ 84850E8 +BattlePyramidSquare15: .4byte BattlePyramidSquare15_Layout .4byte BattlePyramidSquare15_MapEvents .4byte BattlePyramidSquare15_MapScripts .4byte 0x0 .2byte 65535 - .2byte 376 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE15 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc index e08cb110ec..973d7c0ef1 100644 --- a/data/maps/BattlePyramidSquare16/events.inc +++ b/data/maps/BattlePyramidSquare16/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare16_EventObjects: @ 853AF64 +BattlePyramidSquare16_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare16_EventObjects: @ 853AF64 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare16_MapEvents:: @ 853B00C +BattlePyramidSquare16_MapEvents:: map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 24aa3edcc2..b51e9692c1 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare16: @ 8485104 +BattlePyramidSquare16: .4byte BattlePyramidSquare16_Layout .4byte BattlePyramidSquare16_MapEvents .4byte BattlePyramidSquare16_MapScripts .4byte 0x0 .2byte 65535 - .2byte 377 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE16 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc index c5a485f9a7..daf780f739 100644 --- a/data/maps/BirthIsland_Exterior/events.inc +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior_EventObjects: @ 853D7DC +BirthIsland_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS -BirthIsland_Exterior_MapWarps: @ 853D80C +BirthIsland_Exterior_MapWarps: warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR -BirthIsland_Exterior_MapEvents:: @ 853D814 +BirthIsland_Exterior_MapEvents:: map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index c6b02f600b..71af6d880e 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior: @ 8485794 +BirthIsland_Exterior: .4byte BirthIsland_Exterior_Layout .4byte BirthIsland_Exterior_MapEvents .4byte BirthIsland_Exterior_MapScripts .4byte 0x0 .2byte 65535 - .2byte 404 + .2byte LAYOUT_BIRTH_ISLAND_EXTERIOR .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc index 8b8fe46607..1cbef28746 100644 --- a/data/maps/BirthIsland_Harbor/events.inc +++ b/data/maps/BirthIsland_Harbor/events.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor_EventObjects: @ 853D828 +BirthIsland_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -BirthIsland_Harbor_MapWarps: @ 853D858 +BirthIsland_Harbor_MapWarps: warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR -BirthIsland_Harbor_MapEvents:: @ 853D860 +BirthIsland_Harbor_MapEvents:: map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index 82b752f90f..e3b3d53b29 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor: @ 84857B0 +BirthIsland_Harbor: .4byte IslandHarbor_Layout .4byte BirthIsland_Harbor_MapEvents .4byte BirthIsland_Harbor_MapScripts .4byte 0x0 .2byte 65535 - .2byte 405 + .2byte LAYOUT_ISLAND_HARBOR .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc index bdc6298463..098938279f 100644 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ b/data/maps/CaveOfOrigin_1F/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_1F_MapWarps: @ 8535D40 +CaveOfOrigin_1F_MapWarps: warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F -CaveOfOrigin_1F_MapEvents:: @ 8535D50 +CaveOfOrigin_1F_MapEvents:: map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index f051c230cd..df0e323d09 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_1F: @ 84842E8 +CaveOfOrigin_1F: .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 158 + .2byte LAYOUT_CAVE_OF_ORIGIN_1F .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index 94f30d2623..0028301c95 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -1,9 +1,9 @@ -CaveOfOrigin_B1F_EventObjects: @ 8535DD0 +CaveOfOrigin_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE -CaveOfOrigin_B1F_MapWarps: @ 8535DE8 +CaveOfOrigin_B1F_MapWarps: warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F -CaveOfOrigin_B1F_MapEvents:: @ 8535DF0 +CaveOfOrigin_B1F_MapEvents:: map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 7b70ba43f2..200c90bfdc 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_B1F: @ 8484358 +CaveOfOrigin_B1F: .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 .2byte 65535 - .2byte 162 + .2byte LAYOUT_CAVE_OF_ORIGIN_B1F .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc index 5a5ad59f7c..235e4afa0f 100644 --- a/data/maps/CaveOfOrigin_Entrance/events.inc +++ b/data/maps/CaveOfOrigin_Entrance/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_Entrance_MapWarps: @ 8535D1C +CaveOfOrigin_Entrance_MapWarps: warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F -CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C +CaveOfOrigin_Entrance_MapEvents:: map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index af622019a2..afbbd0312e 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_Entrance: @ 84842CC +CaveOfOrigin_Entrance: .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 157 + .2byte LAYOUT_CAVE_OF_ORIGIN_ENTRANCE .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc index 049c263da7..eeb07e63af 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 +CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 -CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 +CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 6b928bb3cc..e0fea7bd5e 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 +CaveOfOrigin_UnusedRubySapphireMap1: .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 159 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc index 5af05a4712..1a8e841b78 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 +CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: 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 +CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 0088131dc8..e8e7c0c793 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 +CaveOfOrigin_UnusedRubySapphireMap2: .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 160 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc index a17416bd31..e1cacec432 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC +CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: 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 +CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 75bd4189ea..ec55cb0ffb 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C +CaveOfOrigin_UnusedRubySapphireMap3: .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 161 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index e7a815ce01..88dad2c289 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,16 +1,16 @@ -DesertRuins_EventObjects: @ 8534354 +DesertRuins_EventObjects: object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK -DesertRuins_MapWarps: @ 853436C +DesertRuins_MapWarps: warp_def 8, 29, 3, 1, MAP_ROUTE111 warp_def 8, 20, 0, 2, MAP_DESERT_RUINS warp_def 8, 11, 3, 1, MAP_DESERT_RUINS -DesertRuins_MapBGEvents: @ 8534384 +DesertRuins_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 -DesertRuins_MapEvents:: @ 85343A8 +DesertRuins_MapEvents:: map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index c717661f4d..f0af5f2e05 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,10 +1,10 @@ -DesertRuins: @ 8483F68 +DesertRuins: .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 131 + .2byte LAYOUT_DESERT_RUINS .byte MAPSEC_DESERT_RUINS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc index aec461c34a..25497be276 100644 --- a/data/maps/DesertUnderpass/events.inc +++ b/data/maps/DesertUnderpass/events.inc @@ -1,9 +1,9 @@ -DesertUnderpass_EventObjects: @ 85376D4 +DesertUnderpass_EventObjects: object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL -DesertUnderpass_MapWarps: @ 85376EC +DesertUnderpass_MapWarps: warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL -DesertUnderpass_MapEvents:: @ 85376F4 +DesertUnderpass_MapEvents:: map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 757d81e73e..ca7ab5254a 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -1,10 +1,10 @@ -DesertUnderpass: @ 8484978 +DesertUnderpass: .4byte DesertUnderpass_Layout .4byte DesertUnderpass_MapEvents .4byte DesertUnderpass_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 389 + .2byte LAYOUT_DESERT_UNDERPASS .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index d030049226..294bf9956a 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,8 +1,8 @@ -DewfordTown_MapConnectionsList: @ 8486640 +DewfordTown_MapConnectionsList: connection up, -60, MAP_ROUTE106 connection right, 0, MAP_ROUTE107 -DewfordTown_MapConnections: @ 8486658 - .4byte 0x2 +DewfordTown_MapConnections: + .4byte 2 .4byte DewfordTown_MapConnectionsList diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index 3d2d0af4a2..0b9036029f 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,24 +1,24 @@ -DewfordTown_EventObjects: @ 8527964 +DewfordTown_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 -DewfordTown_MapWarps: @ 85279DC +DewfordTown_MapWarps: warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 -DewfordTown_MapBGEvents: @ 8527A04 +DewfordTown_MapBGEvents: bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3 bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC -DewfordTown_MapEvents:: @ 8527A40 +DewfordTown_MapEvents:: map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 9314f753fb..03c5b689b4 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,10 +1,10 @@ -DewfordTown: @ 84825EC +DewfordTown: .4byte DewfordTown_Layout .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN - .2byte 12 + .2byte LAYOUT_DEWFORD_TOWN .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index a4c45c2cba..c3b718f194 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -1,4 +1,4 @@ -DewfordTown_Gym_EventObjects: @ 852DB34 +DewfordTown_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 @@ -8,16 +8,16 @@ DewfordTown_Gym_EventObjects: @ 852DB34 object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 -DewfordTown_Gym_MapWarps: @ 852DBF4 +DewfordTown_Gym_MapWarps: warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN -DewfordTown_Gym_MapBGEvents: @ 852DC04 +DewfordTown_Gym_MapBGEvents: bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 -DewfordTown_Gym_MapEvents:: @ 852DC34 +DewfordTown_Gym_MapEvents:: map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 783a7eacc6..72b93573b7 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,10 +1,10 @@ -DewfordTown_Gym: @ 8482C60 +DewfordTown_Gym: .4byte DewfordTown_Gym_Layout .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 65 + .2byte LAYOUT_DEWFORD_TOWN_GYM .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 4f1881f923..7fc332f90a 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -1,4 +1,4 @@ -DewfordTown_Hall_EventObjects: @ 852DC48 +DewfordTown_Hall_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 @@ -9,14 +9,14 @@ DewfordTown_Hall_EventObjects: @ 852DC48 object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN -DewfordTown_Hall_MapWarps: @ 852DD20 +DewfordTown_Hall_MapWarps: warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN -DewfordTown_Hall_MapBGEvents: @ 852DD30 +DewfordTown_Hall_MapBGEvents: bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590 bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0 -DewfordTown_Hall_MapEvents:: @ 852DD48 +DewfordTown_Hall_MapEvents:: map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 600b027631..4fc39cf215 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,10 +1,10 @@ -DewfordTown_Hall: @ 8482C7C +DewfordTown_Hall: .4byte DewfordTown_Hall_Layout .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 66 + .2byte LAYOUT_DEWFORD_TOWN_HALL .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc index 53d72959cd..a9c8b0ae5f 100644 --- a/data/maps/DewfordTown_House1/events.inc +++ b/data/maps/DewfordTown_House1/events.inc @@ -1,12 +1,12 @@ -DewfordTown_House1_EventObjects: @ 852D9C8 +DewfordTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 -DewfordTown_House1_MapWarps: @ 852DA10 +DewfordTown_House1_MapWarps: warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN -DewfordTown_House1_MapEvents:: @ 852DA20 +DewfordTown_House1_MapEvents:: map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index cfaaaa698f..9f4eec0325 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,10 +1,10 @@ -DewfordTown_House1: @ 8482C0C +DewfordTown_House1: .4byte House3_Layout .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc index 039ebac7c7..9f3801afac 100644 --- a/data/maps/DewfordTown_House2/events.inc +++ b/data/maps/DewfordTown_House2/events.inc @@ -1,11 +1,11 @@ -DewfordTown_House2_EventObjects: @ 852DD5C +DewfordTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 -DewfordTown_House2_MapWarps: @ 852DD8C +DewfordTown_House2_MapWarps: warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN -DewfordTown_House2_MapEvents:: @ 852DD9C +DewfordTown_House2_MapEvents:: map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 2f9a36cf8f..ec8359b68d 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,10 +1,10 @@ -DewfordTown_House2: @ 8482C98 +DewfordTown_House2: .4byte House4_Layout .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 67 + .2byte LAYOUT_HOUSE4 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index 830b6fd9b1..86c42ffab3 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 +DewfordTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 -DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C +DewfordTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F -DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94 +DewfordTown_PokemonCenter_1F_MapEvents:: map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index ae98bd680b..b6aa6f7917 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_1F: @ 8482C28 +DewfordTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 4f37111a57..eccedade46 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 +DewfordTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 +DewfordTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20 +DewfordTown_PokemonCenter_2F_MapEvents:: map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index bb46a43d04..8bb0d81d70 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_2F: @ 8482C44 +DewfordTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index ffea67228a..4ea0b7f614 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -1,15 +1,15 @@ -DoubleBattleColosseum_MapWarps: @ 8539E88 +DoubleBattleColosseum_MapWarps: warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE warp_def 8, 8, 3, 127, MAP_NONE -DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 +DoubleBattleColosseum_MapCoordEvents: coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388 coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3 coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9 -DoubleBattleColosseum_MapEvents:: @ 8539EE8 +DoubleBattleColosseum_MapEvents:: map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 032ef58ab3..df679a9180 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,10 +1,10 @@ -DoubleBattleColosseum: @ 8484D84 +DoubleBattleColosseum: .4byte DoubleBattleColosseum_Layout .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 224 + .2byte LAYOUT_DOUBLE_BATTLE_COLOSSEUM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index 830240b078..78c3ba8d1b 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,7 +1,7 @@ -EverGrandeCity_MapConnectionsList: @ 84867F8 +EverGrandeCity_MapConnectionsList: connection left, 40, MAP_ROUTE128 -EverGrandeCity_MapConnections: @ 8486804 - .4byte 0x1 +EverGrandeCity_MapConnections: + .4byte 1 .4byte EverGrandeCity_MapConnectionsList diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index e6bc7a10ad..9c0cd79efe 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_MapWarps: @ 8527588 +EverGrandeCity_MapWarps: warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F -EverGrandeCity_MapCoordEvents: @ 85275A8 +EverGrandeCity_MapCoordEvents: coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 @@ -17,13 +17,13 @@ EverGrandeCity_MapCoordEvents: @ 85275A8 coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 -EverGrandeCity_MapBGEvents: @ 8527658 +EverGrandeCity_MapBGEvents: bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34 bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 -EverGrandeCity_MapEvents:: @ 8527694 +EverGrandeCity_MapEvents:: map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index b1ee8e3a43..7350945788 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity: @ 8482598 +EverGrandeCity: .4byte EverGrandeCity_Layout .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW - .2byte 9 + .2byte LAYOUT_EVER_GRANDE_CITY .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 9ce5831ba9..846e7f60eb 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,12 +1,12 @@ -EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 +EverGrandeCity_ChampionsRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH -EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 +EverGrandeCity_ChampionsRoom_MapWarps: 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 +EverGrandeCity_ChampionsRoom_MapEvents:: map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index bd2ab305f3..0b73346855 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_ChampionsRoom: @ 8483C3C +EverGrandeCity_ChampionsRoom: .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 115 + .2byte LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 4f61f50ea2..997df50453 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 +EverGrandeCity_DrakesRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 -EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC +EverGrandeCity_DrakesRoom_MapWarps: 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 +EverGrandeCity_DrakesRoom_MapEvents:: map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index da5c8fa476..3c5b52b213 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom: @ 8483C20 +EverGrandeCity_DrakesRoom: .4byte EverGrandeCity_DrakesRoom_Layout .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 114 + .2byte LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 63dfbc0df2..abe7b85647 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 +EverGrandeCity_GlaciasRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 -EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 +EverGrandeCity_GlaciasRoom_MapWarps: 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 +EverGrandeCity_GlaciasRoom_MapEvents:: map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 0773a613ec..f330a321fc 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom: @ 8483C04 +EverGrandeCity_GlaciasRoom: .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 113 + .2byte LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc index 3351b42e04..fd3a5584d2 100644 --- a/data/maps/EverGrandeCity_Hall1/events.inc +++ b/data/maps/EverGrandeCity_Hall1/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall1_MapWarps: @ 853376C +EverGrandeCity_Hall1_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM -EverGrandeCity_Hall1_MapEvents:: @ 853378C +EverGrandeCity_Hall1_MapEvents:: map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index d554ff768b..1e2f0f8ebd 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall1: @ 8483C58 +EverGrandeCity_Hall1: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall1_MapEvents .4byte EverGrandeCity_Hall1_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc index e3eacab10f..e9b8ab0561 100644 --- a/data/maps/EverGrandeCity_Hall2/events.inc +++ b/data/maps/EverGrandeCity_Hall2/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall2_MapWarps: @ 85337A0 +EverGrandeCity_Hall2_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM -EverGrandeCity_Hall2_MapEvents:: @ 85337C0 +EverGrandeCity_Hall2_MapEvents:: map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 646478a25d..2422915425 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall2: @ 8483C74 +EverGrandeCity_Hall2: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall2_MapEvents .4byte EverGrandeCity_Hall2_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc index e44182b4fc..3e792fd1b1 100644 --- a/data/maps/EverGrandeCity_Hall3/events.inc +++ b/data/maps/EverGrandeCity_Hall3/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall3_MapWarps: @ 85337D4 +EverGrandeCity_Hall3_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM -EverGrandeCity_Hall3_MapEvents:: @ 85337F4 +EverGrandeCity_Hall3_MapEvents:: map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index d7beaf36e4..fd06433450 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall3: @ 8483C90 +EverGrandeCity_Hall3: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall3_MapEvents .4byte EverGrandeCity_Hall3_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc index b2d0112349..3f40698962 100644 --- a/data/maps/EverGrandeCity_Hall4/events.inc +++ b/data/maps/EverGrandeCity_Hall4/events.inc @@ -1,7 +1,7 @@ -EverGrandeCity_Hall4_MapWarps: @ 8533808 +EverGrandeCity_Hall4_MapWarps: warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM -EverGrandeCity_Hall4_MapEvents:: @ 8533818 +EverGrandeCity_Hall4_MapEvents:: map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 8cf1eea6e9..b2a199823c 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall4: @ 8483CAC +EverGrandeCity_Hall4: .4byte EverGrandeCity_Hall4_Layout .4byte EverGrandeCity_Hall4_MapEvents .4byte EverGrandeCity_Hall4_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 315 + .2byte LAYOUT_EVER_GRANDE_CITY_HALL4 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc index 687920b71b..655f4645e5 100644 --- a/data/maps/EverGrandeCity_Hall5/events.inc +++ b/data/maps/EverGrandeCity_Hall5/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall5_MapWarps: @ 853382C +EverGrandeCity_Hall5_MapWarps: warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F -EverGrandeCity_Hall5_MapEvents:: @ 853384C +EverGrandeCity_Hall5_MapEvents:: map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 38279720eb..f15639e5bf 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall5: @ 8483CC8 +EverGrandeCity_Hall5: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall5_MapEvents .4byte EverGrandeCity_Hall5_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index ad5f088c5a..7d91984377 100644 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_HallOfFame_EventObjects: @ 85338FC +EverGrandeCity_HallOfFame_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -EverGrandeCity_HallOfFame_MapWarps: @ 8533914 +EverGrandeCity_HallOfFame_MapWarps: warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM -EverGrandeCity_HallOfFame_MapEvents:: @ 853391C +EverGrandeCity_HallOfFame_MapEvents:: map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 865f90b91a..7879c19bf6 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_HallOfFame: @ 8483D00 +EverGrandeCity_HallOfFame: .4byte EverGrandeCity_HallOfFame_Layout .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 .2byte MUS_EIKOU_R - .2byte 298 + .2byte LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index abaa816224..d6ad89bea4 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C +EverGrandeCity_PhoebesRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 -EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 +EverGrandeCity_PhoebesRoom_MapWarps: 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 +EverGrandeCity_PhoebesRoom_MapEvents:: map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index eb0d77d7bd..7869d60071 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom: @ 8483BE8 +EverGrandeCity_PhoebesRoom: .4byte EverGrandeCity_PhoebesRoom_Layout .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 112 + .2byte LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index 23e555622e..a879c3bf6c 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 +EverGrandeCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT -EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 +EverGrandeCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F -EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8 +EverGrandeCity_PokemonCenter_1F_MapEvents:: map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 2923564720..060c11d0b9 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_1F: @ 8483D1C +EverGrandeCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 8553361469..5507659225 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC +EverGrandeCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C +EverGrandeCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34 +EverGrandeCity_PokemonCenter_2F_MapEvents:: map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index ec9f3e5425..ae70ad359d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_2F: @ 8483D38 +EverGrandeCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc index dcda8722c5..524540d9d9 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -1,16 +1,16 @@ -EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 +EverGrandeCity_PokemonLeague_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 -EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 +EverGrandeCity_PokemonLeague_1F_MapWarps: 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_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 +EverGrandeCity_PokemonLeague_1F_MapEvents:: map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 90a42edea2..497d81582c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonLeague_1F: @ 8483CE4 +EverGrandeCity_PokemonLeague_1F: .4byte EverGrandeCity_PokemonLeague_1F_Layout .4byte EverGrandeCity_PokemonLeague_1F_MapEvents .4byte EverGrandeCity_PokemonLeague_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 270 + .2byte LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc index b6497d8244..2f26346c81 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 +EverGrandeCity_PokemonLeague_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 +EverGrandeCity_PokemonLeague_2F_MapWarps: warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0 +EverGrandeCity_PokemonLeague_2F_MapEvents:: map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 4d9ee7f460..c03c85120f 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonLeague_2F: @ 8483D54 +EverGrandeCity_PokemonLeague_2F: .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonLeague_2F_MapEvents .4byte EverGrandeCity_PokemonLeague_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index a1446aef82..ca7f7278dd 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 +EverGrandeCity_SidneysRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 -EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 +EverGrandeCity_SidneysRoom_MapWarps: 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 +EverGrandeCity_SidneysRoom_MapEvents:: map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index b19db5fbb2..e7d7f08129 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom: @ 8483BCC +EverGrandeCity_SidneysRoom: .4byte EverGrandeCity_SidneysRoom_Layout .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 111 + .2byte LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 3808099d88..d5955c9e6a 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,8 +1,8 @@ -FallarborTown_MapConnectionsList: @ 8486674 +FallarborTown_MapConnectionsList: connection left, 0, MAP_ROUTE114 connection right, 0, MAP_ROUTE113 -FallarborTown_MapConnections: @ 848668C - .4byte 0x2 +FallarborTown_MapConnections: + .4byte 2 .4byte FallarborTown_MapConnectionsList diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 9b2f0a2de2..b3c451595f 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,17 +1,17 @@ -FallarborTown_EventObjects: @ 8527BE0 +FallarborTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL -FallarborTown_MapWarps: @ 8527C40 +FallarborTown_MapWarps: warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 -FallarborTown_MapBGEvents: @ 8527C68 +FallarborTown_MapBGEvents: bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 @@ -21,6 +21,6 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET -FallarborTown_MapEvents:: @ 8527CC8 +FallarborTown_MapEvents:: map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index f32f0c30b5..2e74cee388 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,10 +1,10 @@ -FallarborTown: @ 8482624 +FallarborTown: .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA - .2byte 14 + .2byte LAYOUT_FALLARBOR_TOWN .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc index 681f5b0285..d452752d7e 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 +FallarborTown_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C +FallarborTown_BattleTentBattleRoom_MapEvents:: map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 3435512f25..615c0ed266 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentBattleRoom: @ 8482DCC +FallarborTown_BattleTentBattleRoom: .4byte BattleTentBattleRoom_Layout .4byte FallarborTown_BattleTentBattleRoom_MapEvents .4byte FallarborTown_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 386 + .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc index 4af82f3530..18c0dfb397 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 +FallarborTown_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 +FallarborTown_BattleTentCorridor_MapEvents:: map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 4b45ea55dd..fd64a32662 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentCorridor: @ 8482DB0 +FallarborTown_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte FallarborTown_BattleTentCorridor_MapEvents .4byte FallarborTown_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index 6a9741c50a..2a9b758ca8 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -1,17 +1,17 @@ -FallarborTown_BattleTentLobby_EventObjects: @ 852E370 +FallarborTown_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT -FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 +FallarborTown_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN -FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 +FallarborTown_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F -FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 +FallarborTown_BattleTentLobby_MapEvents:: map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 2465f36c8b..4bdba3d514 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentLobby: @ 8482D94 +FallarborTown_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte FallarborTown_BattleTentLobby_MapEvents .4byte FallarborTown_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index da261afb42..9db77af03f 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,11 +1,11 @@ -FallarborTown_House1_EventObjects: @ 852E5B8 +FallarborTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 -FallarborTown_House1_MapWarps: @ 852E5E8 +FallarborTown_House1_MapWarps: warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN -FallarborTown_House1_MapEvents:: @ 852E5F8 +FallarborTown_House1_MapEvents:: map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index d5362b8c5c..a17a5e0aba 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,10 +1,10 @@ -FallarborTown_House1: @ 8482E20 +FallarborTown_House1: .4byte House1_Layout .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc index 1b4e1c96e6..117322b020 100644 --- a/data/maps/FallarborTown_House2/events.inc +++ b/data/maps/FallarborTown_House2/events.inc @@ -1,10 +1,10 @@ -FallarborTown_House2_EventObjects: @ 852E60C +FallarborTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 -FallarborTown_House2_MapWarps: @ 852E624 +FallarborTown_House2_MapWarps: warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN -FallarborTown_House2_MapEvents:: @ 852E634 +FallarborTown_House2_MapEvents:: map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 7cb16bbf36..bdbf10fed6 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,10 +1,10 @@ -FallarborTown_House2: @ 8482E3C +FallarborTown_House2: .4byte House2_Layout .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc index 41bc31894e..b4870cf571 100644 --- a/data/maps/FallarborTown_Mart/events.inc +++ b/data/maps/FallarborTown_Mart/events.inc @@ -1,14 +1,14 @@ -FallarborTown_Mart_EventObjects: @ 852E2D4 +FallarborTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 -FallarborTown_Mart_MapWarps: @ 852E34C +FallarborTown_Mart_MapWarps: warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN -FallarborTown_Mart_MapEvents:: @ 852E35C +FallarborTown_Mart_MapEvents:: map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 65c5caaa60..be4e4ae9ed 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,10 +1,10 @@ -FallarborTown_Mart: @ 8482D78 +FallarborTown_Mart: .4byte Mart_Layout .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index cb6243c6f2..f091ffce1e 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 +FallarborTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE -FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 +FallarborTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F -FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 +FallarborTown_PokemonCenter_1F_MapEvents:: map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index b30b4874f1..a03b385b51 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -FallarborTown_PokemonCenter_1F: @ 8482DE8 +FallarborTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 233eab8d9a..bc3c01dd8e 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C +FallarborTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C +FallarborTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4 +FallarborTown_PokemonCenter_2F_MapEvents:: map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index b818368bfa..f3a761312a 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -FallarborTown_PokemonCenter_2F: @ 8482E04 +FallarborTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc index 6c2a8ebe30..0ae752f936 100644 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -1,19 +1,19 @@ -FarawayIsland_Entrance_EventObjects: @ 853D710 +FarawayIsland_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 -FarawayIsland_Entrance_MapWarps: @ 853D740 +FarawayIsland_Entrance_MapWarps: warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR -FarawayIsland_Entrance_MapCoordEvents: @ 853D750 +FarawayIsland_Entrance_MapCoordEvents: coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 -FarawayIsland_Entrance_MapBGEvents: @ 853D780 +FarawayIsland_Entrance_MapBGEvents: bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 -FarawayIsland_Entrance_MapEvents:: @ 853D78C +FarawayIsland_Entrance_MapEvents:: map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index af762d8329..b76f97aef6 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -1,10 +1,10 @@ -FarawayIsland_Entrance: @ 848575C +FarawayIsland_Entrance: .4byte FarawayIsland_Entrance_Layout .4byte FarawayIsland_Entrance_MapEvents .4byte FarawayIsland_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 402 + .2byte LAYOUT_FARAWAY_ISLAND_ENTRANCE .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc index fc8d99166c..a8611c0386 100644 --- a/data/maps/FarawayIsland_Interior/events.inc +++ b/data/maps/FarawayIsland_Interior/events.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior_EventObjects: @ 853D7A0 +FarawayIsland_Interior_EventObjects: object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW -FarawayIsland_Interior_MapWarps: @ 853D7B8 +FarawayIsland_Interior_MapWarps: warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE -FarawayIsland_Interior_MapEvents:: @ 853D7C8 +FarawayIsland_Interior_MapEvents:: map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index c37bacece6..828202471d 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior: @ 8485778 +FarawayIsland_Interior: .4byte FarawayIsland_Interior_Layout .4byte FarawayIsland_Interior_MapEvents .4byte FarawayIsland_Interior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 403 + .2byte LAYOUT_FARAWAY_ISLAND_INTERIOR .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index 0ea132989b..7fd7e44adb 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,4 +1,4 @@ -FieryPath_EventObjects: @ 8534C80 +FieryPath_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 @@ -8,10 +8,10 @@ FieryPath_EventObjects: @ 8534C80 object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE -FieryPath_MapWarps: @ 8534D40 +FieryPath_MapWarps: warp_def 26, 36, 3, 4, MAP_ROUTE112 warp_def 26, 4, 3, 5, MAP_ROUTE112 -FieryPath_MapEvents:: @ 8534D50 +FieryPath_MapEvents:: map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 20278028f7..83e339adbd 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,10 +1,10 @@ -FieryPath: @ 8484048 +FieryPath: .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 293 + .2byte LAYOUT_FIERY_PATH .byte MAPSEC_FIERY_PATH .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 83b48c0ad3..5e48951c29 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,8 +1,8 @@ -FortreeCity_MapConnectionsList: @ 8486784 +FortreeCity_MapConnectionsList: connection left, 0, MAP_ROUTE119 connection right, 0, MAP_ROUTE120 -FortreeCity_MapConnections: @ 848679C - .4byte 0x2 +FortreeCity_MapConnections: + .4byte 2 .4byte FortreeCity_MapConnectionsList diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 4dc9f3e83a..8653934040 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -1,4 +1,4 @@ -FortreeCity_EventObjects: @ 8526B9C +FortreeCity_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 @@ -7,7 +7,7 @@ FortreeCity_EventObjects: @ 8526B9C object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON -FortreeCity_MapWarps: @ 8526C44 +FortreeCity_MapWarps: warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM @@ -18,7 +18,7 @@ FortreeCity_MapWarps: @ 8526C44 warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP -FortreeCity_MapBGEvents: @ 8526C8C +FortreeCity_MapBGEvents: bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602 bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A @@ -26,6 +26,6 @@ FortreeCity_MapBGEvents: @ 8526C8C bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A -FortreeCity_MapEvents:: @ 8526CD4 +FortreeCity_MapEvents:: map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 0bfccda3ce..9d7cd5aaea 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,10 +1,10 @@ -FortreeCity: @ 8482528 +FortreeCity: .4byte FortreeCity_Layout .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 - .2byte 5 + .2byte LAYOUT_FORTREE_CITY .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc index 2c5a0d21ef..604e3fda1a 100644 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -1,13 +1,13 @@ -FortreeCity_DecorationShop_EventObjects: @ 85310B0 +FortreeCity_DecorationShop_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 -FortreeCity_DecorationShop_MapWarps: @ 8531110 +FortreeCity_DecorationShop_MapWarps: warp_def 3, 5, 0, 8, MAP_FORTREE_CITY warp_def 4, 5, 0, 8, MAP_FORTREE_CITY -FortreeCity_DecorationShop_MapEvents:: @ 8531120 +FortreeCity_DecorationShop_MapEvents:: map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 4a640a8ada..b4e0c92051 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,10 +1,10 @@ -FortreeCity_DecorationShop: @ 848361C +FortreeCity_DecorationShop: .4byte FortreeCity_DecorationShop_Layout .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 255 + .2byte LAYOUT_FORTREE_CITY_DECORATION_SHOP .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 307d35cc70..e71b6ea4ec 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -1,4 +1,4 @@ -FortreeCity_Gym_EventObjects: @ 8530C98 +FortreeCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 @@ -8,14 +8,14 @@ FortreeCity_Gym_EventObjects: @ 8530C98 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 -FortreeCity_Gym_MapWarps: @ 8530D58 +FortreeCity_Gym_MapWarps: warp_def 15, 24, 0, 2, MAP_FORTREE_CITY warp_def 16, 24, 0, 2, MAP_FORTREE_CITY -FortreeCity_Gym_MapBGEvents: @ 8530D68 +FortreeCity_Gym_MapBGEvents: bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751 bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761 -FortreeCity_Gym_MapEvents:: @ 8530D80 +FortreeCity_Gym_MapEvents:: map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 68f02747fc..2bde54ddd5 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,10 +1,10 @@ -FortreeCity_Gym: @ 848353C +FortreeCity_Gym: .4byte FortreeCity_Gym_Layout .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 100 + .2byte LAYOUT_FORTREE_CITY_GYM .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc index 45b2a902af..5cf082d413 100644 --- a/data/maps/FortreeCity_House1/events.inc +++ b/data/maps/FortreeCity_House1/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House1_EventObjects: @ 8530C2C +FortreeCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 -FortreeCity_House1_MapWarps: @ 8530C74 +FortreeCity_House1_MapWarps: warp_def 3, 5, 0, 1, MAP_FORTREE_CITY warp_def 4, 5, 0, 1, MAP_FORTREE_CITY -FortreeCity_House1_MapEvents:: @ 8530C84 +FortreeCity_House1_MapEvents:: map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 1b52dd7259..636a147f44 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House1: @ 8483520 +FortreeCity_House1: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc index f9a5c11ab3..ca183c0055 100644 --- a/data/maps/FortreeCity_House2/events.inc +++ b/data/maps/FortreeCity_House2/events.inc @@ -1,11 +1,11 @@ -FortreeCity_House2_EventObjects: @ 8530F30 +FortreeCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 -FortreeCity_House2_MapWarps: @ 8530F60 +FortreeCity_House2_MapWarps: warp_def 3, 5, 0, 4, MAP_FORTREE_CITY warp_def 4, 5, 0, 4, MAP_FORTREE_CITY -FortreeCity_House2_MapEvents:: @ 8530F70 +FortreeCity_House2_MapEvents:: map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 02b76c3941..e61c000f61 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House2: @ 84835AC +FortreeCity_House2: .4byte FortreeCity_House2_Layout .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 101 + .2byte LAYOUT_FORTREE_CITY_HOUSE2 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc index 23ae106883..8a158f8ff3 100644 --- a/data/maps/FortreeCity_House3/events.inc +++ b/data/maps/FortreeCity_House3/events.inc @@ -1,11 +1,11 @@ -FortreeCity_House3_EventObjects: @ 8530F84 +FortreeCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 -FortreeCity_House3_MapWarps: @ 8530FB4 +FortreeCity_House3_MapWarps: warp_def 3, 5, 0, 5, MAP_FORTREE_CITY warp_def 4, 5, 0, 5, MAP_FORTREE_CITY -FortreeCity_House3_MapEvents:: @ 8530FC4 +FortreeCity_House3_MapEvents:: map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 1b039c24e8..db66e65d8a 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House3: @ 84835C8 +FortreeCity_House3: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 8c7e03f765..bc6a4a39c9 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House4_EventObjects: @ 8530FD8 +FortreeCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL -FortreeCity_House4_MapWarps: @ 8531020 +FortreeCity_House4_MapWarps: warp_def 3, 5, 0, 6, MAP_FORTREE_CITY warp_def 4, 5, 0, 6, MAP_FORTREE_CITY -FortreeCity_House4_MapEvents:: @ 8531030 +FortreeCity_House4_MapEvents:: map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index e675e063b2..cd340c2940 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House4: @ 84835E4 +FortreeCity_House4: .4byte FortreeCity_House2_Layout .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 101 + .2byte LAYOUT_FORTREE_CITY_HOUSE2 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc index 8db01a8d02..bc090cb809 100644 --- a/data/maps/FortreeCity_House5/events.inc +++ b/data/maps/FortreeCity_House5/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House5_EventObjects: @ 8531044 +FortreeCity_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 -FortreeCity_House5_MapWarps: @ 853108C +FortreeCity_House5_MapWarps: warp_def 3, 5, 0, 7, MAP_FORTREE_CITY warp_def 4, 5, 0, 7, MAP_FORTREE_CITY -FortreeCity_House5_MapEvents:: @ 853109C +FortreeCity_House5_MapEvents:: map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index bac2fff5ba..a04e91eb31 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House5: @ 8483600 +FortreeCity_House5: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc index e41280e89c..ceb68f7ea1 100644 --- a/data/maps/FortreeCity_Mart/events.inc +++ b/data/maps/FortreeCity_Mart/events.inc @@ -1,13 +1,13 @@ -FortreeCity_Mart_EventObjects: @ 8530EAC +FortreeCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 -FortreeCity_Mart_MapWarps: @ 8530F0C +FortreeCity_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_FORTREE_CITY warp_def 4, 7, 0, 3, MAP_FORTREE_CITY -FortreeCity_Mart_MapEvents:: @ 8530F1C +FortreeCity_Mart_MapEvents:: map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 37af953ab8..f4aaf9ce17 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,10 +1,10 @@ -FortreeCity_Mart: @ 8483590 +FortreeCity_Mart: .4byte Mart_Layout .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index f43cb40635..af7b5f72ef 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 +FortreeCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 -FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 +FortreeCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_FORTREE_CITY warp_def 6, 8, 3, 0, MAP_FORTREE_CITY warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F -FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C +FortreeCity_PokemonCenter_1F_MapEvents:: map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index f2fdf37695..543e672a2c 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_1F: @ 8483558 +FortreeCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 028b5cada7..7cdbc4a82e 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 +FortreeCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 +FortreeCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98 +FortreeCity_PokemonCenter_2F_MapEvents:: map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 1ad4484d92..8dbfeed079 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_2F: @ 8483574 +FortreeCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index 8228e16789..1885f3cf5d 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,13 +1,13 @@ -GraniteCave_1F_EventObjects: @ 85343BC +GraniteCave_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE -GraniteCave_1F_MapWarps: @ 85343EC +GraniteCave_1F_MapWarps: warp_def 37, 12, 3, 0, MAP_ROUTE106 warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM -GraniteCave_1F_MapEvents:: @ 853440C +GraniteCave_1F_MapEvents:: map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 7578523b26..2f834c7eb9 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_1F: @ 8483F84 +GraniteCave_1F: .4byte GraniteCave_1F_Layout .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 132 + .2byte LAYOUT_GRANITE_CAVE_1F .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index b27a68f174..f3dcbcbafb 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,7 +1,7 @@ -GraniteCave_B1F_EventObjects: @ 8534420 +GraniteCave_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL -GraniteCave_B1F_MapWarps: @ 8534438 +GraniteCave_B1F_MapWarps: warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F @@ -10,6 +10,6 @@ GraniteCave_B1F_MapWarps: @ 8534438 warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F -GraniteCave_B1F_MapEvents:: @ 8534470 +GraniteCave_B1F_MapEvents:: map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 64187397c9..546c246580 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_B1F: @ 8483FA0 +GraniteCave_B1F: .4byte GraniteCave_B1F_Layout .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 133 + .2byte LAYOUT_GRANITE_CAVE_B1F .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index 08ac73a5a9..fc321dfb0b 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,4 +1,4 @@ -GraniteCave_B2F_EventObjects: @ 8534484 +GraniteCave_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11 @@ -9,17 +9,17 @@ GraniteCave_B2F_EventObjects: @ 8534484 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16 object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17 -GraniteCave_B2F_MapWarps: @ 853455C +GraniteCave_B2F_MapWarps: warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F -GraniteCave_B2F_MapBGEvents: @ 8534584 +GraniteCave_B2F_MapBGEvents: bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 -GraniteCave_B2F_MapEvents:: @ 853459C +GraniteCave_B2F_MapEvents:: map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 4fd519156d..ce63017bef 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_B2F: @ 8483FBC +GraniteCave_B2F: .4byte GraniteCave_B2F_Layout .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 134 + .2byte LAYOUT_GRANITE_CAVE_B2F .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 387770626a..747fe2cc3a 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,9 +1,9 @@ -GraniteCave_StevensRoom_EventObjects: @ 85345B0 +GraniteCave_StevensRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN -GraniteCave_StevensRoom_MapWarps: @ 85345C8 +GraniteCave_StevensRoom_MapWarps: warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F -GraniteCave_StevensRoom_MapEvents:: @ 85345D0 +GraniteCave_StevensRoom_MapEvents:: map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 0bd8e41b20..6d90fc6c8e 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,10 +1,10 @@ -GraniteCave_StevensRoom: @ 8483FD8 +GraniteCave_StevensRoom: .4byte GraniteCave_StevensRoom_Layout .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 288 + .2byte LAYOUT_GRANITE_CAVE_STEVENS_ROOM .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index f8dbe9ad70..c7888165fd 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -1,25 +1,25 @@ -InsideOfTruck_EventObjects: @ 853A078 +InsideOfTruck_EventObjects: object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 -InsideOfTruck_MapWarps: @ 853A0C0 +InsideOfTruck_MapWarps: warp_def 4, 1, 0, 127, MAP_NONE warp_def 4, 2, 0, 127, MAP_NONE warp_def 4, 3, 0, 127, MAP_NONE -InsideOfTruck_MapCoordEvents: @ 853A0D8 +InsideOfTruck_MapCoordEvents: coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 -InsideOfTruck_MapBGEvents: @ 853A108 +InsideOfTruck_MapBGEvents: bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C -InsideOfTruck_MapEvents:: @ 853A144 +InsideOfTruck_MapEvents:: map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 52ea777a9d..7b1889e250 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -1,10 +1,10 @@ -InsideOfTruck: @ 8484EF0 +InsideOfTruck: .4byte InsideOfTruck_Layout .4byte InsideOfTruck_MapEvents .4byte InsideOfTruck_MapScripts .4byte 0x0 .2byte 65535 - .2byte 237 + .2byte LAYOUT_INSIDE_OF_TRUCK .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte WEATHER_NONE diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index f6abd57a75..fa9c3deba3 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,16 +1,16 @@ -IslandCave_EventObjects: @ 8536C74 +IslandCave_EventObjects: object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE -IslandCave_MapWarps: @ 8536C8C +IslandCave_MapWarps: warp_def 8, 29, 3, 0, MAP_ROUTE105 warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE -IslandCave_MapBGEvents: @ 8536CA4 +IslandCave_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D -IslandCave_MapEvents:: @ 8536CC8 +IslandCave_MapEvents:: map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 767df72f02..15eb2b3603 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,10 +1,10 @@ -IslandCave: @ 8484614 +IslandCave: .4byte IslandCave_Layout .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 280 + .2byte LAYOUT_ISLAND_CAVE .byte MAPSEC_ISLAND_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index f9a82c89b1..5d33af93e7 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,4 +1,4 @@ -JaggedPass_EventObjects: @ 8534AE4 +JaggedPass_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL @@ -7,14 +7,14 @@ JaggedPass_EventObjects: @ 8534AE4 object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 -JaggedPass_MapWarps: @ 8534B8C +JaggedPass_MapWarps: warp_def 14, 40, 3, 2, MAP_ROUTE112 warp_def 15, 40, 3, 3, MAP_ROUTE112 warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F -JaggedPass_MapCoordEvents: @ 8534BB4 +JaggedPass_MapCoordEvents: coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY @@ -26,10 +26,10 @@ JaggedPass_MapCoordEvents: @ 8534BB4 coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB -JaggedPass_MapBGEvents: @ 8534C54 +JaggedPass_MapBGEvents: bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL -JaggedPass_MapEvents:: @ 8534C6C +JaggedPass_MapEvents:: map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index f53bfbe652..870b817ec2 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,10 +1,10 @@ -JaggedPass: @ 848402C +JaggedPass: .4byte JaggedPass_Layout .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 292 + .2byte LAYOUT_JAGGED_PASS .byte MAPSEC_JAGGED_PASS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index 0b8181615c..e3d4e1fb1d 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,7 +1,7 @@ -LavaridgeTown_MapConnectionsList: @ 8486660 +LavaridgeTown_MapConnectionsList: connection right, -40, MAP_ROUTE112 -LavaridgeTown_MapConnections: @ 848666C - .4byte 0x1 +LavaridgeTown_MapConnections: + .4byte 1 .4byte LavaridgeTown_MapConnectionsList diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 6d34ee5c80..aeb55249e8 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -1,4 +1,4 @@ -LavaridgeTown_EventObjects: @ 8527A54 +LavaridgeTown_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 @@ -9,7 +9,7 @@ LavaridgeTown_EventObjects: @ 8527A54 object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 -LavaridgeTown_MapWarps: @ 8527B2C +LavaridgeTown_MapWarps: warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART @@ -17,10 +17,10 @@ LavaridgeTown_MapWarps: @ 8527B2C warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F -LavaridgeTown_MapCoordEvents: @ 8527B5C +LavaridgeTown_MapCoordEvents: coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA -LavaridgeTown_MapBGEvents: @ 8527B6C +LavaridgeTown_MapBGEvents: bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7 bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A @@ -30,6 +30,6 @@ LavaridgeTown_MapBGEvents: @ 8527B6C bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL -LavaridgeTown_MapEvents:: @ 8527BCC +LavaridgeTown_MapEvents:: map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 6ea1e048ce..5365e1a005 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown: @ 8482608 +LavaridgeTown: .4byte LavaridgeTown_Layout .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 - .2byte 13 + .2byte LAYOUT_LAVARIDGE_TOWN .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index ee1cf057f8..08d22737c1 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -1,4 +1,4 @@ -LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C +LavaridgeTown_Gym_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 @@ -6,7 +6,7 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 -LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC +LavaridgeTown_Gym_1F_MapWarps: warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F @@ -34,10 +34,10 @@ LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F -LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C +LavaridgeTown_Gym_1F_MapBGEvents: bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B -LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94 +LavaridgeTown_Gym_1F_MapEvents:: map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 86882ed341..f71786ce0a 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_1F: @ 8482CD0 +LavaridgeTown_Gym_1F: .4byte LavaridgeTown_Gym_1F_Layout .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 69 + .2byte LAYOUT_LAVARIDGE_TOWN_GYM_1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc index 337bfd7612..64512a994a 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 +LavaridgeTown_Gym_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 -LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 +LavaridgeTown_Gym_B1F_MapWarps: warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F @@ -30,6 +30,6 @@ LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F -LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8 +LavaridgeTown_Gym_B1F_MapEvents:: map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index b393e3693c..fc1d6308aa 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_B1F: @ 8482CEC +LavaridgeTown_Gym_B1F: .4byte LavaridgeTown_Gym_B1F_Layout .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 70 + .2byte LAYOUT_LAVARIDGE_TOWN_GYM_B1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index f8602d8722..3cce9612fc 100644 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 +LavaridgeTown_HerbShop_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 -LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 +LavaridgeTown_HerbShop_MapWarps: warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN -LavaridgeTown_HerbShop_MapEvents:: @ 852DE08 +LavaridgeTown_HerbShop_MapEvents:: map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 596d13482d..68fe70df70 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_HerbShop: @ 8482CB4 +LavaridgeTown_HerbShop: .4byte LavaridgeTown_HerbShop_Layout .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 68 + .2byte LAYOUT_LAVARIDGE_TOWN_HERB_SHOP .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc index 0a44e6e8de..77af1e7461 100644 --- a/data/maps/LavaridgeTown_House/events.inc +++ b/data/maps/LavaridgeTown_House/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_House_EventObjects: @ 852E0DC +LavaridgeTown_House_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 -LavaridgeTown_House_MapWarps: @ 852E124 +LavaridgeTown_House_MapWarps: warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN -LavaridgeTown_House_MapEvents:: @ 852E134 +LavaridgeTown_House_MapEvents:: map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 11bb01e136..0815c6fb42 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_House: @ 8482D08 +LavaridgeTown_House: .4byte House3_Layout .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc index 8534faa7bc..24923dc512 100644 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_Mart_EventObjects: @ 852E148 +LavaridgeTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 -LavaridgeTown_Mart_MapWarps: @ 852E190 +LavaridgeTown_Mart_MapWarps: warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN -LavaridgeTown_Mart_MapEvents:: @ 852E1A0 +LavaridgeTown_Mart_MapEvents:: map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 1c3ce0cafe..9c96370f98 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Mart: @ 8482D24 +LavaridgeTown_Mart: .4byte Mart_Layout .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index bf7246caab..01974866cb 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 +LavaridgeTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 -LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 +LavaridgeTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN -LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234 +LavaridgeTown_PokemonCenter_1F_MapEvents:: map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 0f18f64e9e..4e17b5fd09 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_PokemonCenter_1F: @ 8482D40 +LavaridgeTown_PokemonCenter_1F: .4byte LavaridgeTown_PokemonCenter_1F_Layout .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 71 + .2byte LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 6e1011dd87..4da5d3b1ff 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 +LavaridgeTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 +LavaridgeTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0 +LavaridgeTown_PokemonCenter_2F_MapEvents:: map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index d66d90b733..4a7226e29b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_PokemonCenter_2F: @ 8482D5C +LavaridgeTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index d5469e561b..6e0cdff931 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,8 +1,8 @@ -LilycoveCity_MapConnectionsList: @ 84867A4 +LilycoveCity_MapConnectionsList: connection left, 10, MAP_ROUTE121 connection right, -10, MAP_ROUTE124 -LilycoveCity_MapConnections: @ 84867BC - .4byte 0x2 +LilycoveCity_MapConnections: + .4byte 2 .4byte LilycoveCity_MapConnectionsList diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 68a7822120..71022af32f 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_EventObjects: @ 8526CE8 +LilycoveCity_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 @@ -22,7 +22,7 @@ LilycoveCity_EventObjects: @ 8526CE8 object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 -LilycoveCity_MapWarps: @ 8526EF8 +LilycoveCity_MapWarps: warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F @@ -38,7 +38,7 @@ LilycoveCity_MapWarps: @ 8526EF8 warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F -LilycoveCity_MapBGEvents: @ 8526F68 +LilycoveCity_MapBGEvents: bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B @@ -53,6 +53,6 @@ LilycoveCity_MapBGEvents: @ 8526F68 bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL -LilycoveCity_MapEvents:: @ 8527004 +LilycoveCity_MapEvents:: map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index cf3ebf2f5e..93120b8969 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,10 +1,10 @@ -LilycoveCity: @ 8482544 +LilycoveCity: .4byte LilycoveCity_Layout .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO - .2byte 6 + .2byte LAYOUT_LILYCOVE_CITY .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index 61d1cd63a1..838aec23b9 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_ContestHall_EventObjects: @ 8531850 +LilycoveCity_ContestHall_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 @@ -32,13 +32,13 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 -LilycoveCity_ContestHall_MapWarps: @ 8531B50 +LilycoveCity_ContestHall_MapWarps: warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY -LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 +LilycoveCity_ContestHall_MapBGEvents: bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 @@ -46,6 +46,6 @@ LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C -LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 +LilycoveCity_ContestHall_MapEvents:: map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index eb07c7d59b..d450c564e8 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_ContestHall: @ 84836C4 +LilycoveCity_ContestHall: .4byte LilycoveCity_ContestHall_Layout .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 .2byte MUS_CONLOBBY - .2byte 106 + .2byte LAYOUT_LILYCOVE_CITY_CONTEST_HALL .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index fa04b72e73..68c682a257 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_ContestLobby_EventObjects: @ 8531534 +LilycoveCity_ContestLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 @@ -25,13 +25,13 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 -LilycoveCity_ContestLobby_MapWarps: @ 853178C +LilycoveCity_ContestLobby_MapWarps: warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL -LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC +LilycoveCity_ContestLobby_MapBGEvents: bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 @@ -45,6 +45,6 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 -LilycoveCity_ContestLobby_MapEvents:: @ 853183C +LilycoveCity_ContestLobby_MapEvents:: map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 605d594d3c..d00e7190d6 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_ContestLobby: @ 84836A8 +LilycoveCity_ContestLobby: .4byte LilycoveCity_ContestLobby_Layout .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 .2byte MUS_CONLOBBY - .2byte 105 + .2byte LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 66fd112c4e..e769c3c9f1 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 +LilycoveCity_CoveLilyMotel_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 -LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C +LilycoveCity_CoveLilyMotel_1F_MapWarps: warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F -LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 +LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 -LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 +LilycoveCity_CoveLilyMotel_1F_MapEvents:: map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 0322b01e1e..ab7811a465 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_CoveLilyMotel_1F: @ 8483638 +LilycoveCity_CoveLilyMotel_1F: .4byte LilycoveCity_CoveLilyMotel_1F_Layout .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 299 + .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index d7e508ec6e..b7f973a847 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 +LilycoveCity_CoveLilyMotel_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS @@ -7,9 +7,9 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT -LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 +LilycoveCity_CoveLilyMotel_2F_MapWarps: warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F -LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238 +LilycoveCity_CoveLilyMotel_2F_MapEvents:: map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 92ccdc1b3b..769cd8b0dc 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_CoveLilyMotel_2F: @ 8483654 +LilycoveCity_CoveLilyMotel_2F: .4byte LilycoveCity_CoveLilyMotel_2F_Layout .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 300 + .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index adafc5b61e..307cb2d58d 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 +LilycoveCity_DepartmentStoreElevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 -LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 +LilycoveCity_DepartmentStoreElevator_MapWarps: warp_def 1, 5, 3, 127, MAP_NONE warp_def 2, 5, 3, 127, MAP_NONE -LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8 +LilycoveCity_DepartmentStoreElevator_MapEvents:: map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index eb728241b0..8576dcbf29 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator: @ 84838A0 +LilycoveCity_DepartmentStoreElevator: .4byte LilycoveCity_DepartmentStoreElevator_Layout .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 273 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 594a439ce8..c44562b060 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,16 +1,16 @@ -LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C +LilycoveCity_DepartmentStoreRooftop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 -LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C +LilycoveCity_DepartmentStoreRooftop_MapWarps: warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F -LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 +LilycoveCity_DepartmentStoreRooftop_MapBGEvents: bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 -LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C +LilycoveCity_DepartmentStoreRooftop_MapEvents:: map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 73ba491c32..775260145a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreRooftop: @ 8483884 +LilycoveCity_DepartmentStoreRooftop: .4byte LilycoveCity_DepartmentStoreRooftop_Layout .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 262 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index dfd7cc46dd..12d4726fbe 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C +LilycoveCity_DepartmentStore_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 @@ -6,15 +6,15 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 -LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C +LilycoveCity_DepartmentStore_1F_MapWarps: warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C +LilycoveCity_DepartmentStore_1F_MapBGEvents: bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D -LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148 +LilycoveCity_DepartmentStore_1F_MapEvents:: map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 949b23403b..27ae23d5f5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_1F: @ 84837F8 +LilycoveCity_DepartmentStore_1F: .4byte LilycoveCity_DepartmentStore_1F_Layout .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 257 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 9e7d5514ea..4854c51e96 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C +LilycoveCity_DepartmentStore_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 -LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 +LilycoveCity_DepartmentStore_2F_MapWarps: warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC +LilycoveCity_DepartmentStore_2F_MapEvents:: map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 01f94ac14e..62f5dcab3c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_2F: @ 8483814 +LilycoveCity_DepartmentStore_2F: .4byte LilycoveCity_DepartmentStore_2F_Layout .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 258 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 84796fad41..2eed8c39fb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 +LilycoveCity_DepartmentStore_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 -LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 +LilycoveCity_DepartmentStore_3F_MapWarps: warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290 +LilycoveCity_DepartmentStore_3F_MapEvents:: map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index bc62df7d66..624671aea3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_3F: @ 8483830 +LilycoveCity_DepartmentStore_3F: .4byte LilycoveCity_DepartmentStore_3F_Layout .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 259 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 7b39c9194c..77df01a38d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 +LilycoveCity_DepartmentStore_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 -LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C +LilycoveCity_DepartmentStore_4F_MapWarps: warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334 +LilycoveCity_DepartmentStore_4F_MapEvents:: map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 94a8d29c64..df74e3c2f8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_4F: @ 848384C +LilycoveCity_DepartmentStore_4F: .4byte LilycoveCity_DepartmentStore_4F_Layout .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 260 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index 2118c33e81..d4492d7e98 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 +LilycoveCity_DepartmentStore_5F_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 @@ -7,11 +7,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 -LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 +LilycoveCity_DepartmentStore_5F_MapWarps: warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP -LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408 +LilycoveCity_DepartmentStore_5F_MapEvents:: map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 6c8070d803..938cfc7b8f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_5F: @ 8483868 +LilycoveCity_DepartmentStore_5F: .4byte LilycoveCity_DepartmentStore_5F_Layout .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 261 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 4f69e4fc6b..ad43f2bf1d 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_Harbor_EventObjects: @ 8531E1C +LilycoveCity_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER -LilycoveCity_Harbor_MapWarps: @ 8531E94 +LilycoveCity_Harbor_MapWarps: warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY -LilycoveCity_Harbor_MapEvents:: @ 8531EA4 +LilycoveCity_Harbor_MapEvents:: map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index e818c894fa..b332f5df72 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_Harbor: @ 8483750 +LilycoveCity_Harbor: .4byte Harbor_Layout .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 88 + .2byte LAYOUT_HARBOR .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc index 392336e022..31515dae93 100644 --- a/data/maps/LilycoveCity_House1/events.inc +++ b/data/maps/LilycoveCity_House1/events.inc @@ -1,11 +1,11 @@ -LilycoveCity_House1_EventObjects: @ 8531EF4 +LilycoveCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 -LilycoveCity_House1_MapWarps: @ 8531F24 +LilycoveCity_House1_MapWarps: warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY -LilycoveCity_House1_MapEvents:: @ 8531F34 +LilycoveCity_House1_MapEvents:: map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index ecae303728..68da92f8a0 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House1: @ 8483788 +LilycoveCity_House1: .4byte House1_Layout .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc index e4839eb5c5..e7c1b3cd7c 100644 --- a/data/maps/LilycoveCity_House2/events.inc +++ b/data/maps/LilycoveCity_House2/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2_EventObjects: @ 8531F48 +LilycoveCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 -LilycoveCity_House2_MapWarps: @ 8531F60 +LilycoveCity_House2_MapWarps: warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY -LilycoveCity_House2_MapEvents:: @ 8531F70 +LilycoveCity_House2_MapEvents:: map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index f3b0098808..93ff11013c 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2: @ 84837A4 +LilycoveCity_House2: .4byte LilycoveCity_House2_Layout .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 74 + .2byte LAYOUT_LILYCOVE_CITY_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc index 363e62132c..4e577400b7 100644 --- a/data/maps/LilycoveCity_House3/events.inc +++ b/data/maps/LilycoveCity_House3/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_House3_EventObjects: @ 8531F84 +LilycoveCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 @@ -6,10 +6,10 @@ LilycoveCity_House3_EventObjects: @ 8531F84 object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 -LilycoveCity_House3_MapWarps: @ 8532014 +LilycoveCity_House3_MapWarps: warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY -LilycoveCity_House3_MapEvents:: @ 8532024 +LilycoveCity_House3_MapEvents:: map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 9126bb8fc5..3788a2ee9c 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House3: @ 84837C0 +LilycoveCity_House3: .4byte House2_Layout .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc index d14a5c82b9..aa586c64fe 100644 --- a/data/maps/LilycoveCity_House4/events.inc +++ b/data/maps/LilycoveCity_House4/events.inc @@ -1,11 +1,11 @@ -LilycoveCity_House4_EventObjects: @ 8532038 +LilycoveCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 -LilycoveCity_House4_MapWarps: @ 8532068 +LilycoveCity_House4_MapWarps: warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY -LilycoveCity_House4_MapEvents:: @ 8532078 +LilycoveCity_House4_MapEvents:: map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 6ddb9a5f72..b0ee0ed360 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House4: @ 84837DC +LilycoveCity_House4: .4byte House1_Layout .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 52f7a2f9ed..a41748c694 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C +LilycoveCity_LilycoveMuseum_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 @@ -10,12 +10,12 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 -LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C +LilycoveCity_LilycoveMuseum_1F_MapWarps: warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F -LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 +LilycoveCity_LilycoveMuseum_1F_MapBGEvents: bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 @@ -33,6 +33,6 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC -LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414 +LilycoveCity_LilycoveMuseum_1F_MapEvents:: map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index b0aef9efae..7a50114fa0 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_LilycoveMuseum_1F: @ 8483670 +LilycoveCity_LilycoveMuseum_1F: .4byte LilycoveCity_LilycoveMuseum_1F_Layout .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 103 + .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index ecae340c0f..f6969462c4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,13 +1,13 @@ -LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 +LilycoveCity_LilycoveMuseum_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS -LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 +LilycoveCity_LilycoveMuseum_2F_MapWarps: warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F -LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 +LilycoveCity_LilycoveMuseum_2F_MapBGEvents: bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E @@ -21,6 +21,6 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA -LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520 +LilycoveCity_LilycoveMuseum_2F_MapEvents:: map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index c58b692257..f1ba72c036 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_LilycoveMuseum_2F: @ 848368C +LilycoveCity_LilycoveMuseum_2F: .4byte LilycoveCity_LilycoveMuseum_2F_Layout .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 104 + .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index 100ee364cb..8a606ce7e0 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 +LilycoveCity_MoveDeletersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 -LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 +LilycoveCity_MoveDeletersHouse_MapWarps: warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY -LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0 +LilycoveCity_MoveDeletersHouse_MapEvents:: map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index cdd8668ad9..46a0f964eb 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse: @ 848376C +LilycoveCity_MoveDeletersHouse: .4byte House2_Layout .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index 26b6955c0a..5a46fe756d 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC +LilycoveCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY -LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 +LilycoveCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F -LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C +LilycoveCity_PokemonCenter_1F_MapEvents:: map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index bcca0354dd..e264b0955f 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonCenter_1F: @ 84836E0 +LilycoveCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index 1a7e9a6a2a..accbba24d8 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 +LilycoveCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 +LilycoveCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8 +LilycoveCity_PokemonCenter_2F_MapEvents:: map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 26c0789d63..bd96ad98ba 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonCenter_2F: @ 84836FC +LilycoveCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 3d08ce647e..f5755f50f5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 +LilycoveCity_PokemonTrainerFanClub_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 @@ -9,10 +9,10 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER -LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 +LilycoveCity_PokemonTrainerFanClub_MapWarps: warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY -LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08 +LilycoveCity_PokemonTrainerFanClub_MapEvents:: map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index aba9dcb3cf..61f306b69e 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonTrainerFanClub: @ 8483734 +LilycoveCity_PokemonTrainerFanClub: .4byte LilycoveCity_PokemonTrainerFanClub_Layout .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 107 + .2byte LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc index 0481a1c0b3..5a4eeaac9e 100644 --- a/data/maps/LilycoveCity_UnusedMart/events.inc +++ b/data/maps/LilycoveCity_UnusedMart/events.inc @@ -1,7 +1,7 @@ -LilycoveCity_UnusedMart_MapWarps: @ 8531CFC +LilycoveCity_UnusedMart_MapWarps: warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY -LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C +LilycoveCity_UnusedMart_MapEvents:: map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index f1cbaf5508..1885305313 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_UnusedMart: @ 8483718 +LilycoveCity_UnusedMart: .4byte Mart_Layout .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 7b6b875c28..d8a0e93d37 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -1,4 +1,4 @@ -LinkContestRoom1_EventObjects: @ 8539EFC +LinkContestRoom1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 @@ -15,5 +15,6 @@ LinkContestRoom1_EventObjects: @ 8539EFC object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -LinkContestRoom1_MapEvents:: @ 853A064 +LinkContestRoom1_MapEvents:: map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 2465a86804..24a33fdfc9 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom1: @ 8484DA0 +LinkContestRoom1: .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 225 + .2byte LAYOUT_LINK_CONTEST_ROOM1 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index e37d65f86f..50d0a74255 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom2: @ 8484E64 +LinkContestRoom2: .4byte LinkContestRoom2_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 232 + .2byte LAYOUT_LINK_CONTEST_ROOM2 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 90333ebd98..06f9ffd19b 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom3: @ 8484E80 +LinkContestRoom3: .4byte LinkContestRoom3_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 233 + .2byte LAYOUT_LINK_CONTEST_ROOM3 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 781ebed0f9..eba4cb0bd0 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom4: @ 8484E9C +LinkContestRoom4: .4byte LinkContestRoom4_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 234 + .2byte LAYOUT_LINK_CONTEST_ROOM4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 87253d0d6b..12ec2d40d7 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom5: @ 8484EB8 +LinkContestRoom5: .4byte LinkContestRoom5_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 235 + .2byte LAYOUT_LINK_CONTEST_ROOM5 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index ade67e7e71..77f1c14c71 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom6: @ 8484ED4 +LinkContestRoom6: .4byte LinkContestRoom6_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 236 + .2byte LAYOUT_LINK_CONTEST_ROOM6 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index 0fed8d8e1c..bfd3b0ab78 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,7 +1,7 @@ -LittlerootTown_MapConnectionsList: @ 8486600 +LittlerootTown_MapConnectionsList: connection up, 0, MAP_ROUTE101 -LittlerootTown_MapConnections: @ 848660C - .4byte 0x1 +LittlerootTown_MapConnections: + .4byte 1 .4byte LittlerootTown_MapConnectionsList diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index fc151a2205..3d81193b09 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_EventObjects: @ 85276A8 +LittlerootTown_EventObjects: object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 @@ -8,12 +8,12 @@ LittlerootTown_EventObjects: @ 85276A8 object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH -LittlerootTown_MapWarps: @ 8527768 +LittlerootTown_MapWarps: warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB -LittlerootTown_MapCoordEvents: @ 8527780 +LittlerootTown_MapCoordEvents: coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091 coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F @@ -24,12 +24,12 @@ LittlerootTown_MapCoordEvents: @ 8527780 coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE -LittlerootTown_MapBGEvents: @ 8527810 +LittlerootTown_MapBGEvents: bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151 bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163 bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F -LittlerootTown_MapEvents:: @ 8527840 +LittlerootTown_MapEvents:: map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index a94244f95e..c1565535c3 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,10 +1,10 @@ -LittlerootTown: @ 84825B4 +LittlerootTown: .4byte LittlerootTown_Layout .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO - .2byte 10 + .2byte LAYOUT_LITTLEROOT_TOWN .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 6f327d3305..ad4d1a4a67 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C +LittlerootTown_BrendansHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 @@ -7,17 +7,17 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN -LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 +LittlerootTown_BrendansHouse_1F_MapWarps: warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F -LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C +LittlerootTown_BrendansHouse_1F_MapCoordEvents: coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 -LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C +LittlerootTown_BrendansHouse_1F_MapEvents:: map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index edae81a87e..44b861056a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_BrendansHouse_1F: @ 8482AF4 +LittlerootTown_BrendansHouse_1F: .4byte LittlerootTown_BrendansHouse_1F_Layout .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 54 + .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 46a4fcfc22..29dddeb6a4 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 +LittlerootTown_BrendansHouse_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -16,15 +16,15 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL -LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 +LittlerootTown_BrendansHouse_2F_MapWarps: warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F -LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 +LittlerootTown_BrendansHouse_2F_MapBGEvents: bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781 bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F -LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358 +LittlerootTown_BrendansHouse_2F_MapEvents:: map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 4c9e566d0f..5bf1113dd4 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_BrendansHouse_2F: @ 8482B10 +LittlerootTown_BrendansHouse_2F: .4byte LittlerootTown_BrendansHouse_2F_Layout .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 55 + .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 3075945f1e..890a6a6240 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C +LittlerootTown_MaysHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 @@ -7,17 +7,17 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN -LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 +LittlerootTown_MaysHouse_1F_MapWarps: warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F -LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C +LittlerootTown_MaysHouse_1F_MapCoordEvents: coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F -LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C +LittlerootTown_MaysHouse_1F_MapEvents:: map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 768c7d1b43..9ab1d2f8b0 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_MaysHouse_1F: @ 8482B2C +LittlerootTown_MaysHouse_1F: .4byte LittlerootTown_MaysHouse_1F_Layout .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 56 + .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 8f4c74737d..b845971ece 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 +LittlerootTown_MaysHouse_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -16,15 +16,15 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL -LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 +LittlerootTown_MaysHouse_2F_MapWarps: warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F -LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 +LittlerootTown_MaysHouse_2F_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656 bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale -LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638 +LittlerootTown_MaysHouse_2F_MapEvents:: map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 8729bedeb3..d68d04d0d9 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_MaysHouse_2F: @ 8482B48 +LittlerootTown_MaysHouse_2F: .4byte LittlerootTown_MaysHouse_2F_Layout .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 57 + .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index 7ab449ecda..94baaed20f 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C +LittlerootTown_ProfessorBirchsLab_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -6,11 +6,11 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA -LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC +LittlerootTown_ProfessorBirchsLab_MapWarps: warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN -LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC +LittlerootTown_ProfessorBirchsLab_MapBGEvents: bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD @@ -27,6 +27,6 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB -LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 +LittlerootTown_ProfessorBirchsLab_MapEvents:: map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 49ab947271..3cbfbdca73 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_ProfessorBirchsLab: @ 8482B64 +LittlerootTown_ProfessorBirchsLab: .4byte LittlerootTown_ProfessorBirchsLab_Layout .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 .2byte MUS_ODAMAKI - .2byte 58 + .2byte LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index fd82f78e0e..4ee4905b6f 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_1F_EventObjects: @ 85371CC +MagmaHideout_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS @@ -6,12 +6,12 @@ MagmaHideout_1F_EventObjects: @ 85371CC object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13 -MagmaHideout_1F_MapWarps: @ 853725C +MagmaHideout_1F_MapWarps: warp_def 10, 34, 3, 4, MAP_JAGGED_PASS warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R -MagmaHideout_1F_MapEvents:: @ 853727C +MagmaHideout_1F_MapEvents:: map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 897f4f4fdf..2f509f088d 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_1F: @ 8484828 +MagmaHideout_1F: .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 336 + .2byte LAYOUT_MAGMA_HIDEOUT_1F .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc index d808492315..e88bde8849 100644 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ b/data/maps/MagmaHideout_2F_1R/events.inc @@ -1,14 +1,14 @@ -MagmaHideout_2F_1R_EventObjects: @ 8537290 +MagmaHideout_2F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS -MagmaHideout_2F_1R_MapWarps: @ 85372F0 +MagmaHideout_2F_1R_MapWarps: warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R -MagmaHideout_2F_1R_MapEvents:: @ 8537308 +MagmaHideout_2F_1R_MapEvents:: map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index cafe144d8d..29de6cac75 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_1R: @ 8484844 +MagmaHideout_2F_1R: .4byte MagmaHideout_2F_1R_Layout .4byte MagmaHideout_2F_1R_MapEvents .4byte MagmaHideout_2F_1R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 337 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_1R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc index 8bc61def7f..70b234139d 100644 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ b/data/maps/MagmaHideout_2F_2R/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_2F_2R_EventObjects: @ 853731C +MagmaHideout_2F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR @@ -6,10 +6,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE -MagmaHideout_2F_2R_MapWarps: @ 85373AC +MagmaHideout_2F_2R_MapWarps: warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F -MagmaHideout_2F_2R_MapEvents:: @ 85373BC +MagmaHideout_2F_2R_MapEvents:: map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 1493ae0769..4606ef07b5 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_2R: @ 8484860 +MagmaHideout_2F_2R: .4byte MagmaHideout_2F_2R_Layout .4byte MagmaHideout_2F_2R_MapEvents .4byte MagmaHideout_2F_2R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 338 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_2R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc index ca379a0c7e..5b12929d81 100644 --- a/data/maps/MagmaHideout_2F_3R/events.inc +++ b/data/maps/MagmaHideout_2F_3R/events.inc @@ -1,7 +1,7 @@ -MagmaHideout_2F_3R_MapWarps: @ 85375B0 +MagmaHideout_2F_3R_MapWarps: warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R -MagmaHideout_2F_3R_MapEvents:: @ 85375C0 +MagmaHideout_2F_3R_MapEvents:: map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 5e1ccdcda3..dd1d0d9e78 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_3R: @ 84848EC +MagmaHideout_2F_3R: .4byte MagmaHideout_2F_3R_Layout .4byte MagmaHideout_2F_3R_MapEvents .4byte MagmaHideout_2F_3R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 380 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_3R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc index 1fbad5042d..166e88b275 100644 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ b/data/maps/MagmaHideout_3F_1R/events.inc @@ -1,13 +1,13 @@ -MagmaHideout_3F_1R_EventObjects: @ 85373D0 +MagmaHideout_3F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET -MagmaHideout_3F_1R_MapWarps: @ 8537418 +MagmaHideout_3F_1R_MapWarps: warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R -MagmaHideout_3F_1R_MapEvents:: @ 8537430 +MagmaHideout_3F_1R_MapEvents:: map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 492fb8a7e6..ac8d5d9b4a 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_1R: @ 848487C +MagmaHideout_3F_1R: .4byte MagmaHideout_3F_1R_Layout .4byte MagmaHideout_3F_1R_MapEvents .4byte MagmaHideout_3F_1R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 339 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_1R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc index d00cbf423a..825e8985e9 100644 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ b/data/maps/MagmaHideout_3F_2R/events.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R_EventObjects: @ 8537444 +MagmaHideout_3F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX -MagmaHideout_3F_2R_MapWarps: @ 8537474 +MagmaHideout_3F_2R_MapWarps: warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R -MagmaHideout_3F_2R_MapEvents:: @ 853747C +MagmaHideout_3F_2R_MapEvents:: map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index e1cd32f9ce..8fbb30b18a 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R: @ 8484898 +MagmaHideout_3F_2R: .4byte MagmaHideout_3F_2R_Layout .4byte MagmaHideout_3F_2R_MapEvents .4byte MagmaHideout_3F_2R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 340 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_2R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc index 26ffa3dffb..d4346a1390 100644 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ b/data/maps/MagmaHideout_3F_3R/events.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R_EventObjects: @ 8537574 +MagmaHideout_3F_3R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE -MagmaHideout_3F_3R_MapWarps: @ 853758C +MagmaHideout_3F_3R_MapWarps: warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F -MagmaHideout_3F_3R_MapEvents:: @ 853759C +MagmaHideout_3F_3R_MapEvents:: map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index b21df5e70d..c676fac3dd 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R: @ 84848D0 +MagmaHideout_3F_3R: .4byte MagmaHideout_3F_3R_Layout .4byte MagmaHideout_3F_3R_MapEvents .4byte MagmaHideout_3F_3R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 379 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_3R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc index 09e0541097..2fd71b3db0 100644 --- a/data/maps/MagmaHideout_4F/events.inc +++ b/data/maps/MagmaHideout_4F/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_4F_EventObjects: @ 8537490 +MagmaHideout_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS @@ -8,10 +8,10 @@ MagmaHideout_4F_EventObjects: @ 8537490 object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE -MagmaHideout_4F_MapWarps: @ 8537550 +MagmaHideout_4F_MapWarps: warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R -MagmaHideout_4F_MapEvents:: @ 8537560 +MagmaHideout_4F_MapEvents:: map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index e10a780f7a..82a3e66bb8 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_4F: @ 84848B4 +MagmaHideout_4F: .4byte MagmaHideout_4F_Layout .4byte MagmaHideout_4F_MapEvents .4byte MagmaHideout_4F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 341 + .2byte LAYOUT_MAGMA_HIDEOUT_4F .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 62d1cd37e4..4a97b9f15f 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -1,12 +1,12 @@ -MarineCave_End_EventObjects: @ 85377E8 +MarineCave_End_EventObjects: object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE -MarineCave_End_MapWarps: @ 8537800 +MarineCave_End_MapWarps: warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE -MarineCave_End_MapCoordEvents: @ 8537808 +MarineCave_End_MapCoordEvents: coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B -MarineCave_End_MapEvents:: @ 8537818 +MarineCave_End_MapEvents:: map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 5a3c1106bd..e2377aa4b1 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -1,10 +1,10 @@ -MarineCave_End: @ 8484A04 +MarineCave_End: .4byte MarineCave_End_Layout .4byte MarineCave_End_MapEvents .4byte MarineCave_End_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 413 + .2byte LAYOUT_MARINE_CAVE_END .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc index 4db3e1ddcb..9e96bf2257 100644 --- a/data/maps/MarineCave_Entrance/events.inc +++ b/data/maps/MarineCave_Entrance/events.inc @@ -1,6 +1,6 @@ -MarineCave_Entrance_MapWarps: @ 85377CC +MarineCave_Entrance_MapWarps: warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END -MarineCave_Entrance_MapEvents:: @ 85377D4 +MarineCave_Entrance_MapEvents:: map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 338da988ae..a1ce8ac617 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -1,10 +1,10 @@ -MarineCave_Entrance: @ 84849E8 +MarineCave_Entrance: .4byte MarineCave_Entrance_Layout .4byte MarineCave_Entrance_MapEvents .4byte MarineCave_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 407 + .2byte LAYOUT_MARINE_CAVE_ENTRANCE .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index ee1f4e72a0..97f97982c3 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,10 +1,10 @@ -MauvilleCity_MapConnectionsList: @ 8486720 +MauvilleCity_MapConnectionsList: connection up, 0, MAP_ROUTE111 connection down, 0, MAP_ROUTE110 connection left, 0, MAP_ROUTE117 connection right, 0, MAP_ROUTE118 -MauvilleCity_MapConnections: @ 8486750 - .4byte 0x4 +MauvilleCity_MapConnections: + .4byte 4 .4byte MauvilleCity_MapConnectionsList diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index ebdc866f5d..961eb40053 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_EventObjects: @ 852662C +MauvilleCity_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 @@ -11,7 +11,7 @@ MauvilleCity_EventObjects: @ 852662C object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT -MauvilleCity_MapWarps: @ 8526734 +MauvilleCity_MapWarps: warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP @@ -20,7 +20,7 @@ MauvilleCity_MapWarps: @ 8526734 warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 -MauvilleCity_MapBGEvents: @ 852676C +MauvilleCity_MapBGEvents: bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0 bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A @@ -30,6 +30,6 @@ MauvilleCity_MapBGEvents: @ 852676C bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9 bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2 -MauvilleCity_MapEvents:: @ 85267CC +MauvilleCity_MapEvents:: map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index aa107e460b..566eb49e73 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,10 +1,10 @@ -MauvilleCity: @ 84824F0 +MauvilleCity: .4byte MauvilleCity_Layout .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN - .2byte 3 + .2byte LAYOUT_MAUVILLE_CITY .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index bae1870034..ac9abae2a6 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_BikeShop_EventObjects: @ 852FE80 +MauvilleCity_BikeShop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 -MauvilleCity_BikeShop_MapWarps: @ 852FEB0 +MauvilleCity_BikeShop_MapWarps: warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY -MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 +MauvilleCity_BikeShop_MapBGEvents: bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE -MauvilleCity_BikeShop_MapEvents:: @ 852FED8 +MauvilleCity_BikeShop_MapEvents:: map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index d4434e8ba0..244439fed5 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_BikeShop: @ 8483280 +MauvilleCity_BikeShop: .4byte MauvilleCity_BikeShop_Layout .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 90 + .2byte LAYOUT_MAUVILLE_CITY_BIKE_SHOP .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 0fac26b5d4..c5ef3b7f6a 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_GameCorner_EventObjects: @ 852FF28 +MauvilleCity_GameCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 @@ -12,11 +12,11 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 -MauvilleCity_GameCorner_MapWarps: @ 8530048 +MauvilleCity_GameCorner_MapWarps: warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY -MauvilleCity_GameCorner_MapBGEvents: @ 8530058 +MauvilleCity_GameCorner_MapBGEvents: bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6 bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6 bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316 @@ -42,6 +42,6 @@ MauvilleCity_GameCorner_MapBGEvents: @ 8530058 bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF -MauvilleCity_GameCorner_MapEvents:: @ 8530178 +MauvilleCity_GameCorner_MapEvents:: map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 5c7399ae6e..f13c98c776 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_GameCorner: @ 84832B8 +MauvilleCity_GameCorner: .4byte MauvilleCity_GameCorner_Layout .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 .2byte MUS_CASINO - .2byte 91 + .2byte LAYOUT_MAUVILLE_CITY_GAME_CORNER .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 4a05acafb4..10c3c039d6 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_Gym_EventObjects: @ 852FD5C +MauvilleCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 @@ -7,20 +7,20 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 -MauvilleCity_Gym_MapWarps: @ 852FE04 +MauvilleCity_Gym_MapWarps: warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY -MauvilleCity_Gym_MapCoordEvents: @ 852FE14 +MauvilleCity_Gym_MapCoordEvents: coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043 coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9 coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068 -MauvilleCity_Gym_MapBGEvents: @ 852FE54 +MauvilleCity_Gym_MapBGEvents: bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B -MauvilleCity_Gym_MapEvents:: @ 852FE6C +MauvilleCity_Gym_MapEvents:: map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index cd38ec176e..5f9666eeba 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_Gym: @ 8483264 +MauvilleCity_Gym: .4byte MauvilleCity_Gym_Layout .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 89 + .2byte LAYOUT_MAUVILLE_CITY_GYM .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc index 1d759b438f..19b88a97eb 100644 --- a/data/maps/MauvilleCity_House1/events.inc +++ b/data/maps/MauvilleCity_House1/events.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1_EventObjects: @ 852FEEC +MauvilleCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 -MauvilleCity_House1_MapWarps: @ 852FF04 +MauvilleCity_House1_MapWarps: warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY -MauvilleCity_House1_MapEvents:: @ 852FF14 +MauvilleCity_House1_MapEvents:: map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 261e0e45bb..c36670be5d 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1: @ 848329C +MauvilleCity_House1: .4byte House2_Layout .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc index fae511bb33..a27fec0424 100644 --- a/data/maps/MauvilleCity_House2/events.inc +++ b/data/maps/MauvilleCity_House2/events.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2_EventObjects: @ 853018C +MauvilleCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 -MauvilleCity_House2_MapWarps: @ 85301A4 +MauvilleCity_House2_MapWarps: warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY -MauvilleCity_House2_MapEvents:: @ 85301B4 +MauvilleCity_House2_MapEvents:: map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 3a584fe41c..60fc3ae22c 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2: @ 84832D4 +MauvilleCity_House2: .4byte House1_Layout .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc index 0d32a0e2c1..1a5f9a3b75 100644 --- a/data/maps/MauvilleCity_Mart/events.inc +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -1,12 +1,12 @@ -MauvilleCity_Mart_EventObjects: @ 8530310 +MauvilleCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 -MauvilleCity_Mart_MapWarps: @ 8530358 +MauvilleCity_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY -MauvilleCity_Mart_MapEvents:: @ 8530368 +MauvilleCity_Mart_MapEvents:: map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index b3d85a0c66..b986d7e3b5 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_Mart: @ 8483328 +MauvilleCity_Mart: .4byte Mart_Layout .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index daf747e0d5..f97d611365 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 +MauvilleCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 -MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 +MauvilleCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F -MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258 +MauvilleCity_PokemonCenter_1F_MapEvents:: map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 207dfb5263..623cd61e6d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_PokemonCenter_1F: @ 84832F0 +MauvilleCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index 031dac2133..b4b2d15ba3 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C +MauvilleCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 -MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 +MauvilleCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC +MauvilleCity_PokemonCenter_2F_MapEvents:: map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 00bf23b830..bde4b43765 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_PokemonCenter_2F: @ 848330C +MauvilleCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 8f84327d2c..63c17fc0df 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,4 +1,4 @@ -MeteorFalls_1F_1R_EventObjects: @ 8533F74 +MeteorFalls_1F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL @@ -10,7 +10,7 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO -MeteorFalls_1F_1R_MapWarps: @ 8534064 +MeteorFalls_1F_1R_MapWarps: warp_def 27, 18, 4, 0, MAP_ROUTE114 warp_def 6, 39, 3, 0, MAP_ROUTE115 warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R @@ -18,12 +18,12 @@ MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE -MeteorFalls_1F_1R_MapCoordEvents: @ 8534094 +MeteorFalls_1F_1R_MapCoordEvents: coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F -MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 +MeteorFalls_1F_1R_MapBGEvents: bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 -MeteorFalls_1F_1R_MapEvents:: @ 85340B0 +MeteorFalls_1F_1R_MapEvents:: map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 85ba8dd6b2..5bffcd6bad 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_1F_1R: @ 8483EC0 +MeteorFalls_1F_1R: .4byte MeteorFalls_1F_1R_Layout .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 125 + .2byte LAYOUT_METEOR_FALLS_1F_1R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index d9a15cbcbc..fe845ae674 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -1,17 +1,17 @@ -MeteorFalls_1F_2R_EventObjects: @ 85340C4 +MeteorFalls_1F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 -MeteorFalls_1F_2R_MapWarps: @ 853410C +MeteorFalls_1F_2R_MapWarps: warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R -MeteorFalls_1F_2R_MapBGEvents: @ 853412C +MeteorFalls_1F_2R_MapBGEvents: bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 -MeteorFalls_1F_2R_MapEvents:: @ 8534138 +MeteorFalls_1F_2R_MapEvents:: map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 79b56a254a..4ee1d78c96 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_1F_2R: @ 8483EDC +MeteorFalls_1F_2R: .4byte MeteorFalls_1F_2R_Layout .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 126 + .2byte LAYOUT_METEOR_FALLS_1F_2R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc index 039f316d97..1407f4e99a 100644 --- a/data/maps/MeteorFalls_B1F_1R/events.inc +++ b/data/maps/MeteorFalls_B1F_1R/events.inc @@ -1,4 +1,4 @@ -MeteorFalls_B1F_1R_MapWarps: @ 853414C +MeteorFalls_B1F_1R_MapWarps: warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R @@ -6,6 +6,6 @@ MeteorFalls_B1F_1R_MapWarps: @ 853414C warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R -MeteorFalls_B1F_1R_MapEvents:: @ 853417C +MeteorFalls_B1F_1R_MapEvents:: map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 0d1edf89e3..9ae4d6e684 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_B1F_1R: @ 8483EF8 +MeteorFalls_B1F_1R: .4byte MeteorFalls_B1F_1R_Layout .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 127 + .2byte LAYOUT_METEOR_FALLS_B1F_1R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 44b283d1e4..fb1826f6e6 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,9 +1,9 @@ -MeteorFalls_B1F_2R_EventObjects: @ 8534190 +MeteorFalls_B1F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 -MeteorFalls_B1F_2R_MapWarps: @ 85341A8 +MeteorFalls_B1F_2R_MapWarps: warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R -MeteorFalls_B1F_2R_MapEvents:: @ 85341B0 +MeteorFalls_B1F_2R_MapEvents:: map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index ed9fe8bebb..d48c61b6d6 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_B1F_2R: @ 8483F14 +MeteorFalls_B1F_2R: .4byte MeteorFalls_B1F_2R_Layout .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 128 + .2byte LAYOUT_METEOR_FALLS_B1F_2R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc index 09225365d3..c9fcf8bd39 100644 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ b/data/maps/MeteorFalls_StevensCave/events.inc @@ -1,9 +1,9 @@ -MeteorFalls_StevensCave_EventObjects: @ 85378B0 +MeteorFalls_StevensCave_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 -MeteorFalls_StevensCave_MapWarps: @ 85378C8 +MeteorFalls_StevensCave_MapWarps: warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R -MeteorFalls_StevensCave_MapEvents:: @ 85378D0 +MeteorFalls_StevensCave_MapEvents:: map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 28b265d446..c615b53dea 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_StevensCave: @ 8484A74 +MeteorFalls_StevensCave: .4byte MeteorFalls_StevensCave_Layout .4byte MeteorFalls_StevensCave_MapEvents .4byte MeteorFalls_StevensCave_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 431 + .2byte LAYOUT_METEOR_FALLS_STEVENS_CAVE .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc index f35ce6d2a1..f797b84c88 100644 --- a/data/maps/MirageTower_1F/events.inc +++ b/data/maps/MirageTower_1F/events.inc @@ -1,7 +1,7 @@ -MirageTower_1F_MapWarps: @ 85375D4 +MirageTower_1F_MapWarps: warp_def 10, 14, 3, 3, MAP_ROUTE111 warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F -MirageTower_1F_MapEvents:: @ 85375E4 +MirageTower_1F_MapEvents:: map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 59ce7edbf2..67035316ec 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -1,10 +1,10 @@ -MirageTower_1F: @ 8484908 +MirageTower_1F: .4byte MirageTower_1F_Layout .4byte MirageTower_1F_MapEvents .4byte MirageTower_1F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 381 + .2byte LAYOUT_MIRAGE_TOWER_1F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc index fdbafbe068..6cbb1fb37e 100644 --- a/data/maps/MirageTower_2F/events.inc +++ b/data/maps/MirageTower_2F/events.inc @@ -1,7 +1,7 @@ -MirageTower_2F_MapWarps: @ 85375F8 +MirageTower_2F_MapWarps: warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F -MirageTower_2F_MapEvents:: @ 8537608 +MirageTower_2F_MapEvents:: map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index efb9705383..65a5c46650 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -1,10 +1,10 @@ -MirageTower_2F: @ 8484924 +MirageTower_2F: .4byte MirageTower_2F_Layout .4byte MirageTower_2F_MapEvents .4byte MirageTower_2F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 382 + .2byte LAYOUT_MIRAGE_TOWER_2F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc index 4f55d74852..9fbc189dd1 100644 --- a/data/maps/MirageTower_3F/events.inc +++ b/data/maps/MirageTower_3F/events.inc @@ -1,11 +1,11 @@ -MirageTower_3F_EventObjects: @ 853761C +MirageTower_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12 -MirageTower_3F_MapWarps: @ 853764C +MirageTower_3F_MapWarps: warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F -MirageTower_3F_MapEvents:: @ 853765C +MirageTower_3F_MapEvents:: map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index 7362c553e3..565ff1f6d4 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -1,10 +1,10 @@ -MirageTower_3F: @ 8484940 +MirageTower_3F: .4byte MirageTower_3F_Layout .4byte MirageTower_3F_MapEvents .4byte MirageTower_3F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 383 + .2byte LAYOUT_MIRAGE_TOWER_3F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc index 61c536c612..a2b22cad19 100644 --- a/data/maps/MirageTower_4F/events.inc +++ b/data/maps/MirageTower_4F/events.inc @@ -1,11 +1,11 @@ -MirageTower_4F_EventObjects: @ 8537670 +MirageTower_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11 -MirageTower_4F_MapWarps: @ 85376B8 +MirageTower_4F_MapWarps: warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F -MirageTower_4F_MapEvents:: @ 85376C0 +MirageTower_4F_MapEvents:: map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 842b12bb68..b3bc8341a8 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -1,10 +1,10 @@ -MirageTower_4F: @ 848495C +MirageTower_4F: .4byte MirageTower_4F_Layout .4byte MirageTower_4F_MapEvents .4byte MirageTower_4F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 388 + .2byte LAYOUT_MIRAGE_TOWER_4F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index a1845c04c9..c22091fe7c 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,8 +1,9 @@ -MossdeepCity_MapConnectionsList: @ 84867C4 +MossdeepCity_MapConnectionsList: connection up, 0, MAP_ROUTE125 connection down, 0, MAP_ROUTE127 connection left, -40, MAP_ROUTE124 -MossdeepCity_MapConnections: @ 84867E8 - .4byte 0x3 +MossdeepCity_MapConnections: + .4byte 3 .4byte MossdeepCity_MapConnectionsList + diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 5a653bc229..a8284ae5dd 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_EventObjects: @ 8527018 +MossdeepCity_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 @@ -17,7 +17,7 @@ MossdeepCity_EventObjects: @ 8527018 object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 -MossdeepCity_MapWarps: @ 85271B0 +MossdeepCity_MapWarps: warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F @@ -29,7 +29,7 @@ MossdeepCity_MapWarps: @ 85271B0 warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F -MossdeepCity_MapCoordEvents: @ 8527200 +MossdeepCity_MapCoordEvents: coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 @@ -41,7 +41,7 @@ MossdeepCity_MapCoordEvents: @ 8527200 coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 -MossdeepCity_MapBGEvents: @ 85272A0 +MossdeepCity_MapBGEvents: bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26 bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 @@ -51,6 +51,6 @@ MossdeepCity_MapBGEvents: @ 85272A0 bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14 -MossdeepCity_MapEvents:: @ 8527300 +MossdeepCity_MapEvents:: map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 641faf0f79..5ac6ceeaa2 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,10 +1,10 @@ -MossdeepCity: @ 8482560 +MossdeepCity: .4byte MossdeepCity_Layout .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN - .2byte 7 + .2byte LAYOUT_MOSSDEEP_CITY .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 2f96c458fc..e9b491f4d7 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -1,17 +1,17 @@ -MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 +MossdeepCity_GameCorner_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 -MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 +MossdeepCity_GameCorner_1F_MapWarps: warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F -MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 +MossdeepCity_GameCorner_1F_MapBGEvents: bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96 -MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC +MossdeepCity_GameCorner_1F_MapEvents:: map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index d32f3a3062..572a5fbe92 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_GameCorner_1F: @ 84839F0 +MossdeepCity_GameCorner_1F: .4byte MossdeepCity_GameCorner_1F_Layout .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 305 + .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index 0737cd7e01..d86974ae95 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -1,9 +1,9 @@ -MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 +MossdeepCity_GameCorner_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 +MossdeepCity_GameCorner_B1F_MapWarps: warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F -MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 +MossdeepCity_GameCorner_B1F_MapEvents:: map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 856f76166e..ee2f557319 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_GameCorner_B1F: @ 8483A0C +MossdeepCity_GameCorner_B1F: .4byte MossdeepCity_GameCorner_B1F_Layout .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 306 + .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index a6511d2c1f..bc18f4eb77 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_Gym_EventObjects: @ 85324EC +MossdeepCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 @@ -36,7 +36,7 @@ MossdeepCity_Gym_EventObjects: @ 85324EC object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -MossdeepCity_Gym_MapWarps: @ 853284C +MossdeepCity_Gym_MapWarps: warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM @@ -52,7 +52,7 @@ MossdeepCity_Gym_MapWarps: @ 853284C warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM -MossdeepCity_Gym_MapCoordEvents: @ 85328BC +MossdeepCity_Gym_MapCoordEvents: coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D @@ -63,10 +63,10 @@ MossdeepCity_Gym_MapCoordEvents: @ 85328BC coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1 coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 -MossdeepCity_Gym_MapBGEvents: @ 853294C +MossdeepCity_Gym_MapBGEvents: bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33 bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43 -MossdeepCity_Gym_MapEvents:: @ 8532964 +MossdeepCity_Gym_MapEvents:: map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 12421b7872..e596d834be 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_Gym: @ 84838BC +MossdeepCity_Gym: .4byte MossdeepCity_Gym_Layout .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 108 + .2byte LAYOUT_MOSSDEEP_CITY_GYM .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc index 4ccf90558d..c16a852dfa 100644 --- a/data/maps/MossdeepCity_House1/events.inc +++ b/data/maps/MossdeepCity_House1/events.inc @@ -1,11 +1,11 @@ -MossdeepCity_House1_EventObjects: @ 8532978 +MossdeepCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 -MossdeepCity_House1_MapWarps: @ 85329A8 +MossdeepCity_House1_MapWarps: warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY -MossdeepCity_House1_MapEvents:: @ 85329B8 +MossdeepCity_House1_MapEvents:: map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 365120f528..c0a3de2c90 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House1: @ 84838D8 +MossdeepCity_House1: .4byte House2_Layout .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 8e169c3b0d..57d398ce90 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,12 +1,12 @@ -MossdeepCity_House2_EventObjects: @ 85329CC +MossdeepCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL -MossdeepCity_House2_MapWarps: @ 8532A14 +MossdeepCity_House2_MapWarps: warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY -MossdeepCity_House2_MapEvents:: @ 8532A24 +MossdeepCity_House2_MapEvents:: map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 76673969a0..ffa15e3271 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House2: @ 84838F4 +MossdeepCity_House2: .4byte House1_Layout .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc index 374808598d..7eb2c34161 100644 --- a/data/maps/MossdeepCity_House3/events.inc +++ b/data/maps/MossdeepCity_House3/events.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3_EventObjects: @ 8532BD4 +MossdeepCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 -MossdeepCity_House3_MapWarps: @ 8532BEC +MossdeepCity_House3_MapWarps: warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY -MossdeepCity_House3_MapEvents:: @ 8532BFC +MossdeepCity_House3_MapEvents:: map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 0d5be2fede..b8caf392d1 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3: @ 8483964 +MossdeepCity_House3: .4byte House2_Layout .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc index 5e33f871f3..71dd54a5e4 100644 --- a/data/maps/MossdeepCity_House4/events.inc +++ b/data/maps/MossdeepCity_House4/events.inc @@ -1,12 +1,12 @@ -MossdeepCity_House4_EventObjects: @ 8532CAC +MossdeepCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 -MossdeepCity_House4_MapWarps: @ 8532CF4 +MossdeepCity_House4_MapWarps: warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY -MossdeepCity_House4_MapEvents:: @ 8532D04 +MossdeepCity_House4_MapEvents:: map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index ba90597579..1e748b7b4b 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House4: @ 848399C +MossdeepCity_House4: .4byte HouseWithBed_Layout .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc index d452187d1e..770cb7ee5c 100644 --- a/data/maps/MossdeepCity_Mart/events.inc +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -1,13 +1,13 @@ -MossdeepCity_Mart_EventObjects: @ 8532B50 +MossdeepCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 -MossdeepCity_Mart_MapWarps: @ 8532BB0 +MossdeepCity_Mart_MapWarps: warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY -MossdeepCity_Mart_MapEvents:: @ 8532BC0 +MossdeepCity_Mart_MapEvents:: map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 7de6cb5de6..75ea708d1a 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_Mart: @ 8483948 +MossdeepCity_Mart: .4byte Mart_Layout .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index 5e48096c9f..53aa694703 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 +MossdeepCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 -MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 +MossdeepCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F -MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98 +MossdeepCity_PokemonCenter_1F_MapEvents:: map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index b97b7108d7..719394a941 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_1F: @ 8483910 +MossdeepCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index c2158f4f47..ce27a0804b 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -1,15 +1,15 @@ -MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC +MossdeepCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 -MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 +MossdeepCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C +MossdeepCity_PokemonCenter_2F_MapEvents:: map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 263511ce97..7bb1d541ca 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_2F: @ 848392C +MossdeepCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index dbb5a47eb6..84466046f4 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 +MossdeepCity_SpaceCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 @@ -11,11 +11,11 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN -MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 +MossdeepCity_SpaceCenter_1F_MapWarps: warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F -MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38 +MossdeepCity_SpaceCenter_1F_MapEvents:: map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 5e99c584ad..5bce64c21b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_SpaceCenter_1F: @ 84839B8 +MossdeepCity_SpaceCenter_1F: .4byte MossdeepCity_SpaceCenter_1F_Layout .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 275 + .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index 6c271b5de4..624185dfc2 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C +MossdeepCity_SpaceCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 @@ -9,9 +9,9 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA -MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 +MossdeepCity_SpaceCenter_2F_MapWarps: warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F -MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C +MossdeepCity_SpaceCenter_2F_MapEvents:: map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 3f4eab34e5..1d6b5834f6 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_SpaceCenter_2F: @ 84839D4 +MossdeepCity_SpaceCenter_2F: .4byte MossdeepCity_SpaceCenter_2F_Layout .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 276 + .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index dd8b3d1b46..c9fa20d623 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,18 +1,18 @@ -MossdeepCity_StevensHouse_EventObjects: @ 8532C10 +MossdeepCity_StevensHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY -MossdeepCity_StevensHouse_MapWarps: @ 8532C58 +MossdeepCity_StevensHouse_MapWarps: warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY -MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 +MossdeepCity_StevensHouse_MapBGEvents: bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 -MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 +MossdeepCity_StevensHouse_MapEvents:: map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 693801b86e..a6e197f204 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_StevensHouse: @ 8483980 +MossdeepCity_StevensHouse: .4byte MossdeepCity_StevensHouse_Layout .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 327 + .2byte LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index d11ba584e9..e341872a70 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,4 +1,4 @@ -MtChimney_EventObjects: @ 85347C8 +MtChimney_EventObjects: object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA @@ -30,16 +30,16 @@ MtChimney_EventObjects: @ 85347C8 object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS -MtChimney_MapWarps: @ 8534A98 +MtChimney_MapWarps: warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION warp_def 20, 41, 3, 2, MAP_JAGGED_PASS warp_def 21, 41, 3, 3, MAP_JAGGED_PASS -MtChimney_MapBGEvents: @ 8534AB8 +MtChimney_MapBGEvents: bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4 bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141 -MtChimney_MapEvents:: @ 8534AD0 +MtChimney_MapEvents:: map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 9cd0659030..a7f03617e3 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,10 +1,10 @@ -MtChimney: @ 8484010 +MtChimney: .4byte MtChimney_Layout .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 136 + .2byte LAYOUT_MT_CHIMNEY .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_ASH diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc index 491ca79977..24f64fbbb4 100644 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -1,11 +1,11 @@ -MtChimney_CableCarStation_EventObjects: @ 8533CA8 +MtChimney_CableCarStation_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 -MtChimney_CableCarStation_MapWarps: @ 8533CD8 +MtChimney_CableCarStation_MapWarps: warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY -MtChimney_CableCarStation_MapEvents:: @ 8533CE8 +MtChimney_CableCarStation_MapEvents:: map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 0f858f9c1e..7b3d628ccd 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,10 +1,10 @@ -MtChimney_CableCarStation: @ 8483DFC +MtChimney_CableCarStation: .4byte CableCarStation_Layout .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 .2byte MUS_DOORO_X1 - .2byte 118 + .2byte LAYOUT_CABLE_CAR_STATION .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 5fd8215411..7b1d79e165 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,9 +1,9 @@ -MtPyre_1F_EventObjects: @ 8534D64 +MtPyre_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 -MtPyre_1F_MapWarps: @ 8534DAC +MtPyre_1F_MapWarps: warp_def 17, 18, 3, 0, MAP_ROUTE122 warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR warp_def 18, 18, 3, 0, MAP_ROUTE122 @@ -11,6 +11,6 @@ MtPyre_1F_MapWarps: @ 8534DAC warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F -MtPyre_1F_MapEvents:: @ 8534DDC +MtPyre_1F_MapEvents:: map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index f60532fa2c..b4d6603df9 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,10 +1,10 @@ -MtPyre_1F: @ 8484064 +MtPyre_1F: .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 137 + .2byte LAYOUT_MT_PYRE_1F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index f9fad9f46f..f0ec0d0a34 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,4 +1,4 @@ -MtPyre_2F_EventObjects: @ 8534DF0 +MtPyre_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 @@ -8,13 +8,13 @@ MtPyre_2F_EventObjects: @ 8534DF0 object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 -MtPyre_2F_MapWarps: @ 8534EB0 +MtPyre_2F_MapWarps: warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F -MtPyre_2F_MapEvents:: @ 8534ED8 +MtPyre_2F_MapEvents:: map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 1abca71436..b1906b82e6 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,10 +1,10 @@ -MtPyre_2F: @ 8484080 +MtPyre_2F: .4byte MtPyre_2F_Layout .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 138 + .2byte LAYOUT_MT_PYRE_2F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index f78373aca0..4d6f3c9eac 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,10 +1,10 @@ -MtPyre_3F_EventObjects: @ 8534EEC +MtPyre_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 -MtPyre_3F_MapWarps: @ 8534F4C +MtPyre_3F_MapWarps: warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F @@ -12,6 +12,6 @@ MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F -MtPyre_3F_MapEvents:: @ 8534F7C +MtPyre_3F_MapEvents:: map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 3f54a36701..96026c7d9f 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,10 +1,10 @@ -MtPyre_3F: @ 848409C +MtPyre_3F: .4byte MtPyre_3F_Layout .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 139 + .2byte LAYOUT_MT_PYRE_3F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index ffe5688801..030039d18b 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,8 +1,8 @@ -MtPyre_4F_EventObjects: @ 8534F90 +MtPyre_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE -MtPyre_4F_MapWarps: @ 8534FC0 +MtPyre_4F_MapWarps: warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F @@ -10,6 +10,6 @@ MtPyre_4F_MapWarps: @ 8534FC0 warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F -MtPyre_4F_MapEvents:: @ 8534FF0 +MtPyre_4F_MapEvents:: map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 1c41c3a6d7..86edc3843c 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,10 +1,10 @@ -MtPyre_4F: @ 84840B8 +MtPyre_4F: .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 140 + .2byte LAYOUT_MT_PYRE_4F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index afd3801e3b..fd6261356f 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,14 +1,14 @@ -MtPyre_5F_EventObjects: @ 8535004 +MtPyre_5F_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE -MtPyre_5F_MapWarps: @ 8535034 +MtPyre_5F_MapWarps: warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F -MtPyre_5F_MapEvents:: @ 853505C +MtPyre_5F_MapEvents:: map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 17c8eddcd8..8296f03dcc 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,10 +1,10 @@ -MtPyre_5F: @ 84840D4 +MtPyre_5F: .4byte MtPyre_5F_Layout .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 141 + .2byte LAYOUT_MT_PYRE_5F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index 3ab5dcf705..df862d84e6 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,12 +1,12 @@ -MtPyre_6F_EventObjects: @ 8535070 +MtPyre_6F_EventObjects: object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 -MtPyre_6F_MapWarps: @ 85350B8 +MtPyre_6F_MapWarps: warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F -MtPyre_6F_MapEvents:: @ 85350C8 +MtPyre_6F_MapEvents:: map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 4e80828207..ca0e545aa9 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,10 +1,10 @@ -MtPyre_6F: @ 84840F0 +MtPyre_6F: .4byte MtPyre_6F_Layout .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 142 + .2byte LAYOUT_MT_PYRE_6F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 75c9489e4b..1b8248e02c 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,23 +1,23 @@ -MtPyre_Exterior_EventObjects: @ 85350DC +MtPyre_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 -MtPyre_Exterior_MapWarps: @ 853510C +MtPyre_Exterior_MapWarps: warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT -MtPyre_Exterior_MapCoordEvents: @ 8535124 +MtPyre_Exterior_MapCoordEvents: coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED -MtPyre_Exterior_MapBGEvents: @ 8535174 +MtPyre_Exterior_MapBGEvents: bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER -MtPyre_Exterior_MapEvents:: @ 853518C +MtPyre_Exterior_MapEvents:: map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 3b703a41e2..9b9dfe1fad 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,10 +1,10 @@ -MtPyre_Exterior: @ 848410C +MtPyre_Exterior: .4byte MtPyre_Exterior_Layout .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 302 + .2byte LAYOUT_MT_PYRE_EXTERIOR .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index b112fbcfef..abe957f283 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,4 +1,4 @@ -MtPyre_Summit_EventObjects: @ 85351A0 +MtPyre_Summit_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 @@ -8,12 +8,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE -MtPyre_Summit_MapWarps: @ 8535260 +MtPyre_Summit_MapWarps: warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR -MtPyre_Summit_MapCoordEvents: @ 8535278 +MtPyre_Summit_MapCoordEvents: coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 @@ -21,10 +21,10 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 -MtPyre_Summit_MapBGEvents: @ 85352D8 +MtPyre_Summit_MapBGEvents: bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY -MtPyre_Summit_MapEvents:: @ 85352F0 +MtPyre_Summit_MapEvents:: map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 29a28e99b7..483afb9891 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,10 +1,10 @@ -MtPyre_Summit: @ 8484128 +MtPyre_Summit: .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 303 + .2byte LAYOUT_MT_PYRE_SUMMIT .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc index e83d221ddd..5142b09a20 100644 --- a/data/maps/NavelRock_B1F/events.inc +++ b/data/maps/NavelRock_B1F/events.inc @@ -1,7 +1,7 @@ -NavelRock_B1F_MapWarps: @ 853DA94 +NavelRock_B1F_MapWarps: warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK -NavelRock_B1F_MapEvents:: @ 853DAA4 +NavelRock_B1F_MapEvents:: map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index cf56d8fb48..08842ade1d 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,10 +1,10 @@ -NavelRock_B1F: @ 84858C8 +NavelRock_B1F: .4byte NavelRock_B1F_Layout .4byte NavelRock_B1F_MapEvents .4byte NavelRock_B1F_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 427 + .2byte LAYOUT_NAVEL_ROCK_B1F .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc index d18565161c..16fa053ce9 100644 --- a/data/maps/NavelRock_Bottom/events.inc +++ b/data/maps/NavelRock_Bottom/events.inc @@ -1,9 +1,9 @@ -NavelRock_Bottom_EventObjects: @ 853DD50 +NavelRock_Bottom_EventObjects: object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA -NavelRock_Bottom_MapWarps: @ 853DD68 +NavelRock_Bottom_MapWarps: warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 -NavelRock_Bottom_MapEvents:: @ 853DD70 +NavelRock_Bottom_MapEvents:: map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index d6f9b9d5a0..b768e916aa 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -1,10 +1,10 @@ -NavelRock_Bottom: @ 8485AC0 +NavelRock_Bottom: .4byte NavelRock_Bottom_Layout .4byte NavelRock_Bottom_MapEvents .4byte NavelRock_Bottom_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 424 + .2byte LAYOUT_NAVEL_ROCK_BOTTOM .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc index 3a60452154..9874119a91 100644 --- a/data/maps/NavelRock_Down01/events.inc +++ b/data/maps/NavelRock_Down01/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down01_MapWarps: @ 853DBC4 +NavelRock_Down01_MapWarps: warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 -NavelRock_Down01_MapEvents:: @ 853DBD4 +NavelRock_Down01_MapEvents:: map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 2dc18c232d..7cddeeae7b 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down01: @ 848598C +NavelRock_Down01: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down01_MapEvents .4byte NavelRock_Down01_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc index 7441539c91..449085ea5d 100644 --- a/data/maps/NavelRock_Down02/events.inc +++ b/data/maps/NavelRock_Down02/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down02_MapWarps: @ 853DBE8 +NavelRock_Down02_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 -NavelRock_Down02_MapEvents:: @ 853DBF8 +NavelRock_Down02_MapEvents:: map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 731e4e2fb7..03d45822b1 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down02: @ 84859A8 +NavelRock_Down02: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down02_MapEvents .4byte NavelRock_Down02_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc index 20dabdfaf9..7b74ad4121 100644 --- a/data/maps/NavelRock_Down03/events.inc +++ b/data/maps/NavelRock_Down03/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down03_MapWarps: @ 853DC0C +NavelRock_Down03_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 -NavelRock_Down03_MapEvents:: @ 853DC1C +NavelRock_Down03_MapEvents:: map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index fdf22dbc3f..694f840e4d 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down03: @ 84859C4 +NavelRock_Down03: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down03_MapEvents .4byte NavelRock_Down03_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc index e50f6fe230..5459b1d508 100644 --- a/data/maps/NavelRock_Down04/events.inc +++ b/data/maps/NavelRock_Down04/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down04_MapWarps: @ 853DC30 +NavelRock_Down04_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 -NavelRock_Down04_MapEvents:: @ 853DC40 +NavelRock_Down04_MapEvents:: map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index 7f93253b17..0275b6422d 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down04: @ 84859E0 +NavelRock_Down04: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down04_MapEvents .4byte NavelRock_Down04_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc index 500d38e9bd..de52fa07f5 100644 --- a/data/maps/NavelRock_Down05/events.inc +++ b/data/maps/NavelRock_Down05/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down05_MapWarps: @ 853DC54 +NavelRock_Down05_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 -NavelRock_Down05_MapEvents:: @ 853DC64 +NavelRock_Down05_MapEvents:: map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 602f440e0d..50e298b6e0 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down05: @ 84859FC +NavelRock_Down05: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down05_MapEvents .4byte NavelRock_Down05_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc index 0773677477..54e5f229eb 100644 --- a/data/maps/NavelRock_Down06/events.inc +++ b/data/maps/NavelRock_Down06/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down06_MapWarps: @ 853DC78 +NavelRock_Down06_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 -NavelRock_Down06_MapEvents:: @ 853DC88 +NavelRock_Down06_MapEvents:: map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index c3ec1fe559..8e18db5b92 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down06: @ 8485A18 +NavelRock_Down06: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down06_MapEvents .4byte NavelRock_Down06_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc index 83f7ce9a68..55b4dd10c4 100644 --- a/data/maps/NavelRock_Down07/events.inc +++ b/data/maps/NavelRock_Down07/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down07_MapWarps: @ 853DC9C +NavelRock_Down07_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 -NavelRock_Down07_MapEvents:: @ 853DCAC +NavelRock_Down07_MapEvents:: map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index f3a5ab3f34..75c41046e7 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down07: @ 8485A34 +NavelRock_Down07: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down07_MapEvents .4byte NavelRock_Down07_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc index 38bef10e88..b1180ed83a 100644 --- a/data/maps/NavelRock_Down08/events.inc +++ b/data/maps/NavelRock_Down08/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down08_MapWarps: @ 853DCC0 +NavelRock_Down08_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 -NavelRock_Down08_MapEvents:: @ 853DCD0 +NavelRock_Down08_MapEvents:: map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 3a6f28081a..bcb69b4128 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down08: @ 8485A50 +NavelRock_Down08: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down08_MapEvents .4byte NavelRock_Down08_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc index e3843e7591..e7279c4d08 100644 --- a/data/maps/NavelRock_Down09/events.inc +++ b/data/maps/NavelRock_Down09/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down09_MapWarps: @ 853DCE4 +NavelRock_Down09_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 -NavelRock_Down09_MapEvents:: @ 853DCF4 +NavelRock_Down09_MapEvents:: map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index f132b9f669..cb80dd7fae 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down09: @ 8485A6C +NavelRock_Down09: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down09_MapEvents .4byte NavelRock_Down09_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc index 805e399b48..b9eadabf1e 100644 --- a/data/maps/NavelRock_Down10/events.inc +++ b/data/maps/NavelRock_Down10/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down10_MapWarps: @ 853DD08 +NavelRock_Down10_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 -NavelRock_Down10_MapEvents:: @ 853DD18 +NavelRock_Down10_MapEvents:: map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 3ee4d62cec..308a89e05c 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down10: @ 8485A88 +NavelRock_Down10: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down10_MapEvents .4byte NavelRock_Down10_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc index 505a6ed6d4..9822ee8ff1 100644 --- a/data/maps/NavelRock_Down11/events.inc +++ b/data/maps/NavelRock_Down11/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down11_MapWarps: @ 853DD2C +NavelRock_Down11_MapWarps: warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 -NavelRock_Down11_MapEvents:: @ 853DD3C +NavelRock_Down11_MapEvents:: map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index ef2ad00b7c..2c5a0862b9 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down11: @ 8485AA4 +NavelRock_Down11: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down11_MapEvents .4byte NavelRock_Down11_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc index ee45485a72..b063f08d8a 100644 --- a/data/maps/NavelRock_Entrance/events.inc +++ b/data/maps/NavelRock_Entrance/events.inc @@ -1,7 +1,7 @@ -NavelRock_Entrance_MapWarps: @ 853DA70 +NavelRock_Entrance_MapWarps: warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR -NavelRock_Entrance_MapEvents:: @ 853DA80 +NavelRock_Entrance_MapEvents:: map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index dbc28a7816..793ab85cdf 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -1,10 +1,10 @@ -NavelRock_Entrance: @ 84858AC +NavelRock_Entrance: .4byte NavelRock_Entrance_Layout .4byte NavelRock_Entrance_MapEvents .4byte NavelRock_Entrance_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 422 + .2byte LAYOUT_NAVEL_ROCK_ENTRANCE .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc index 66bbf376f1..1ec151c8c2 100644 --- a/data/maps/NavelRock_Exterior/events.inc +++ b/data/maps/NavelRock_Exterior/events.inc @@ -1,7 +1,7 @@ -NavelRock_Exterior_MapWarps: @ 853DA00 +NavelRock_Exterior_MapWarps: warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE -NavelRock_Exterior_MapEvents:: @ 853DA10 +NavelRock_Exterior_MapEvents:: map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index e13422c260..f355dbf559 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,10 +1,10 @@ -NavelRock_Exterior: @ 8485874 +NavelRock_Exterior: .4byte NavelRock_Exterior_Layout .4byte NavelRock_Exterior_MapEvents .4byte NavelRock_Exterior_MapScripts .4byte 0x0 .2byte MUS_RG_NANASHIMA - .2byte 421 + .2byte LAYOUT_NAVEL_ROCK_EXTERIOR .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc index 869dc0f089..fde5e5930e 100644 --- a/data/maps/NavelRock_Fork/events.inc +++ b/data/maps/NavelRock_Fork/events.inc @@ -1,8 +1,8 @@ -NavelRock_Fork_MapWarps: @ 853DAB8 +NavelRock_Fork_MapWarps: warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 -NavelRock_Fork_MapEvents:: @ 853DAD0 +NavelRock_Fork_MapEvents:: map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 49087db7e2..01e4f7bccd 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,10 +1,10 @@ -NavelRock_Fork: @ 84858E4 +NavelRock_Fork: .4byte NavelRock_Fork_Layout .4byte NavelRock_Fork_MapEvents .4byte NavelRock_Fork_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 428 + .2byte LAYOUT_NAVEL_ROCK_FORK .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc index b5a299572a..0c687f1fc0 100644 --- a/data/maps/NavelRock_Harbor/events.inc +++ b/data/maps/NavelRock_Harbor/events.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor_EventObjects: @ 853DA24 +NavelRock_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -NavelRock_Harbor_MapWarps: @ 853DA54 +NavelRock_Harbor_MapWarps: warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR -NavelRock_Harbor_MapEvents:: @ 853DA5C +NavelRock_Harbor_MapEvents:: map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 1df05a2bc3..2af7e6e35e 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor: @ 8485890 +NavelRock_Harbor: .4byte IslandHarbor_Layout .4byte NavelRock_Harbor_MapEvents .4byte NavelRock_Harbor_MapScripts .4byte 0x0 .2byte MUS_RG_NANASHIMA - .2byte 405 + .2byte LAYOUT_ISLAND_HARBOR .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index 0952b0f675..7ba534d027 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -1,15 +1,15 @@ -NavelRock_Top_EventObjects: @ 853DB74 +NavelRock_Top_EventObjects: object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH -NavelRock_Top_MapWarps: @ 853DB8C +NavelRock_Top_MapWarps: warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 -NavelRock_Top_MapCoordEvents: @ 853DB94 +NavelRock_Top_MapCoordEvents: coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F -NavelRock_Top_MapBGEvents: @ 853DBA4 +NavelRock_Top_MapBGEvents: bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH -NavelRock_Top_MapEvents:: @ 853DBB0 +NavelRock_Top_MapEvents:: map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index e99a64054e..6e8acfce85 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -1,10 +1,10 @@ -NavelRock_Top: @ 8485970 +NavelRock_Top: .4byte NavelRock_Top_Layout .4byte NavelRock_Top_MapEvents .4byte NavelRock_Top_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 423 + .2byte LAYOUT_NAVEL_ROCK_TOP .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc index fd0741a6a9..c0dba5dd3a 100644 --- a/data/maps/NavelRock_Up1/events.inc +++ b/data/maps/NavelRock_Up1/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up1_MapWarps: @ 853DAE4 +NavelRock_Up1_MapWarps: warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 -NavelRock_Up1_MapEvents:: @ 853DAF4 +NavelRock_Up1_MapEvents:: map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index 33266d8f0b..2ddaf1dcc6 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up1: @ 8485900 +NavelRock_Up1: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up1_MapEvents .4byte NavelRock_Up1_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc index bd142b9972..8d6f64dbc2 100644 --- a/data/maps/NavelRock_Up2/events.inc +++ b/data/maps/NavelRock_Up2/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up2_MapWarps: @ 853DB08 +NavelRock_Up2_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 -NavelRock_Up2_MapEvents:: @ 853DB18 +NavelRock_Up2_MapEvents:: map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index f93dc31ed6..68fe366f2c 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up2: @ 848591C +NavelRock_Up2: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up2_MapEvents .4byte NavelRock_Up2_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc index 9491e5dac2..3853f75c7e 100644 --- a/data/maps/NavelRock_Up3/events.inc +++ b/data/maps/NavelRock_Up3/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up3_MapWarps: @ 853DB2C +NavelRock_Up3_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 -NavelRock_Up3_MapEvents:: @ 853DB3C +NavelRock_Up3_MapEvents:: map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index d816e58f1a..b357349b7c 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up3: @ 8485938 +NavelRock_Up3: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up3_MapEvents .4byte NavelRock_Up3_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc index 3d81f15231..449e1f29da 100644 --- a/data/maps/NavelRock_Up4/events.inc +++ b/data/maps/NavelRock_Up4/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up4_MapWarps: @ 853DB50 +NavelRock_Up4_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP -NavelRock_Up4_MapEvents:: @ 853DB60 +NavelRock_Up4_MapEvents:: map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 583c672b43..4c44746f06 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up4: @ 8485954 +NavelRock_Up4: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up4_MapEvents .4byte NavelRock_Up4_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 4c333f6b3f..d230fc4e99 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -1,10 +1,10 @@ -NewMauville_Entrance_MapWarps: @ 8536474 +NewMauville_Entrance_MapWarps: warp_def 4, 6, 3, 0, MAP_ROUTE110 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE -NewMauville_Entrance_MapCoordEvents: @ 8536484 +NewMauville_Entrance_MapCoordEvents: coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF -NewMauville_Entrance_MapEvents:: @ 8536494 +NewMauville_Entrance_MapEvents:: map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index a8a1df2968..c0b8938ca4 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,10 +1,10 @@ -NewMauville_Entrance: @ 8484470 +NewMauville_Entrance: .4byte NewMauville_Entrance_Layout .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 184 + .2byte LAYOUT_NEW_MAUVILLE_ENTRANCE .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index 568f4b22ed..c366496f4d 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,4 +1,4 @@ -NewMauville_Inside_EventObjects: @ 85364A8 +NewMauville_Inside_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE @@ -8,10 +8,10 @@ NewMauville_Inside_EventObjects: @ 85364A8 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 -NewMauville_Inside_MapWarps: @ 8536568 +NewMauville_Inside_MapWarps: warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE -NewMauville_Inside_MapCoordEvents: @ 8536570 +NewMauville_Inside_MapCoordEvents: coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 @@ -23,7 +23,7 @@ NewMauville_Inside_MapCoordEvents: @ 8536570 coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725 -NewMauville_Inside_MapBGEvents: @ 8536610 +NewMauville_Inside_MapBGEvents: bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F @@ -33,6 +33,6 @@ NewMauville_Inside_MapBGEvents: @ 8536610 bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F -NewMauville_Inside_MapEvents:: @ 8536670 +NewMauville_Inside_MapEvents:: map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 57966d38fe..c4e7368859 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,10 +1,10 @@ -NewMauville_Inside: @ 848448C +NewMauville_Inside: .4byte NewMauville_Inside_Layout .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 185 + .2byte LAYOUT_NEW_MAUVILLE_INSIDE .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index db0232f834..a82523c9c0 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,9 +1,9 @@ -OldaleTown_MapConnectionsList: @ 8486614 +OldaleTown_MapConnectionsList: connection up, 0, MAP_ROUTE103 connection down, 0, MAP_ROUTE101 connection left, 0, MAP_ROUTE102 -OldaleTown_MapConnections: @ 8486638 - .4byte 0x3 +OldaleTown_MapConnections: + .4byte 3 .4byte OldaleTown_MapConnectionsList diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index a3bc51483b..aa56e67f64 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -1,28 +1,28 @@ -OldaleTown_EventObjects: @ 8527854 +OldaleTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL -OldaleTown_MapWarps: @ 85278B4 +OldaleTown_MapWarps: warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART -OldaleTown_MapCoordEvents: @ 85278D4 +OldaleTown_MapCoordEvents: coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086 coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6 coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6 -OldaleTown_MapBGEvents: @ 8527914 +OldaleTown_MapBGEvents: bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A -OldaleTown_MapEvents:: @ 8527950 +OldaleTown_MapEvents:: map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 83f3624dcc..30025e1f1d 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,10 +1,10 @@ -OldaleTown: @ 84825D0 +OldaleTown: .4byte OldaleTown_Layout .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 - .2byte 11 + .2byte LAYOUT_OLDALE_TOWN .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc index 7183f92934..8fc37079c7 100644 --- a/data/maps/OldaleTown_House1/events.inc +++ b/data/maps/OldaleTown_House1/events.inc @@ -1,10 +1,10 @@ -OldaleTown_House1_EventObjects: @ 852D7B4 +OldaleTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 -OldaleTown_House1_MapWarps: @ 852D7CC +OldaleTown_House1_MapWarps: warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN -OldaleTown_House1_MapEvents:: @ 852D7DC +OldaleTown_House1_MapEvents:: map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 6444d83c48..7dc2d6b70a 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,10 +1,10 @@ -OldaleTown_House1: @ 8482B80 +OldaleTown_House1: .4byte House1_Layout .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc index 7e94a2356d..45678ebb88 100644 --- a/data/maps/OldaleTown_House2/events.inc +++ b/data/maps/OldaleTown_House2/events.inc @@ -1,11 +1,11 @@ -OldaleTown_House2_EventObjects: @ 852D7F0 +OldaleTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 -OldaleTown_House2_MapWarps: @ 852D820 +OldaleTown_House2_MapWarps: warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN -OldaleTown_House2_MapEvents:: @ 852D830 +OldaleTown_House2_MapEvents:: map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 0df8e3c0e3..4ae5e078ce 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,10 +1,10 @@ -OldaleTown_House2: @ 8482B9C +OldaleTown_House2: .4byte House2_Layout .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc index 22b308364a..2d29aedba7 100644 --- a/data/maps/OldaleTown_Mart/events.inc +++ b/data/maps/OldaleTown_Mart/events.inc @@ -1,12 +1,12 @@ -OldaleTown_Mart_EventObjects: @ 852D95C +OldaleTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 -OldaleTown_Mart_MapWarps: @ 852D9A4 +OldaleTown_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN -OldaleTown_Mart_MapEvents:: @ 852D9B4 +OldaleTown_Mart_MapEvents:: map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index df506157b2..a371273bd8 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,10 +1,10 @@ -OldaleTown_Mart: @ 8482BF0 +OldaleTown_Mart: .4byte Mart_Layout .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index ba50faea90..f05c854b4c 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 +OldaleTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 -OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 +OldaleTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F -OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC +OldaleTown_PokemonCenter_1F_MapEvents:: map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 250f5d1644..394ca49695 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -OldaleTown_PokemonCenter_1F: @ 8482BB8 +OldaleTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index 34f343eb46..2f155ed57c 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 +OldaleTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 +OldaleTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948 +OldaleTown_PokemonCenter_2F_MapEvents:: map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 1562c900f8..33437b8637 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -OldaleTown_PokemonCenter_2F: @ 8482BD4 +OldaleTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index 5c84301bf5..bea3619dd0 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,8 +1,8 @@ -PacifidlogTown_MapConnectionsList: @ 84866B4 +PacifidlogTown_MapConnectionsList: connection left, 0, MAP_ROUTE132 connection right, 0, MAP_ROUTE131 -PacifidlogTown_MapConnections: @ 84866CC - .4byte 0x2 +PacifidlogTown_MapConnections: + .4byte 2 .4byte PacifidlogTown_MapConnectionsList diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index f73c1d14a5..2754afc4d5 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -1,9 +1,9 @@ -PacifidlogTown_EventObjects: @ 8527DE8 +PacifidlogTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 -PacifidlogTown_MapWarps: @ 8527E30 +PacifidlogTown_MapWarps: warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 @@ -11,11 +11,11 @@ PacifidlogTown_MapWarps: @ 8527E30 warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 -PacifidlogTown_MapBGEvents: @ 8527E60 +PacifidlogTown_MapBGEvents: bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 -PacifidlogTown_MapEvents:: @ 8527E84 +PacifidlogTown_MapEvents:: map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 786fa9d713..0232c06134 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown: @ 848265C +PacifidlogTown: .4byte PacifidlogTown_Layout .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO - .2byte 16 + .2byte LAYOUT_PACIFIDLOG_TOWN .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc index ac082b74a3..3b5b06af7b 100644 --- a/data/maps/PacifidlogTown_House1/events.inc +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House1_EventObjects: @ 852EBA0 +PacifidlogTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 -PacifidlogTown_House1_MapWarps: @ 852EBD0 +PacifidlogTown_House1_MapWarps: warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House1_MapEvents:: @ 852EBE0 +PacifidlogTown_House1_MapEvents:: map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index a4f350e069..53a3499ce9 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House1: @ 8482F8C +PacifidlogTown_House1: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc index fae916c735..5a521ab4b9 100644 --- a/data/maps/PacifidlogTown_House2/events.inc +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House2_EventObjects: @ 852EBF4 +PacifidlogTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 -PacifidlogTown_House2_MapWarps: @ 852EC3C +PacifidlogTown_House2_MapWarps: warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House2_MapEvents:: @ 852EC4C +PacifidlogTown_House2_MapEvents:: map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 8a3e0ada4e..f41349ba5b 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House2: @ 8482FA8 +PacifidlogTown_House2: .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 78 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc index 30460329a2..7f18a831e5 100644 --- a/data/maps/PacifidlogTown_House3/events.inc +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House3_EventObjects: @ 852EC60 +PacifidlogTown_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 -PacifidlogTown_House3_MapWarps: @ 852EC90 +PacifidlogTown_House3_MapWarps: warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House3_MapEvents:: @ 852ECA0 +PacifidlogTown_House3_MapEvents:: map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index ed538fa8b0..9f6286b13a 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House3: @ 8482FC4 +PacifidlogTown_House3: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc index 740cc4ba34..ed736434f4 100644 --- a/data/maps/PacifidlogTown_House4/events.inc +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House4_EventObjects: @ 852ECB4 +PacifidlogTown_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 -PacifidlogTown_House4_MapWarps: @ 852ECFC +PacifidlogTown_House4_MapWarps: warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House4_MapEvents:: @ 852ED0C +PacifidlogTown_House4_MapEvents:: map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 7108a0104d..ff9240d0d6 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House4: @ 8482FE0 +PacifidlogTown_House4: .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 78 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc index 8d7f0b0c0c..d3e00938a8 100644 --- a/data/maps/PacifidlogTown_House5/events.inc +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House5_EventObjects: @ 852ED20 +PacifidlogTown_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 -PacifidlogTown_House5_MapWarps: @ 852ED50 +PacifidlogTown_House5_MapWarps: warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House5_MapEvents:: @ 852ED60 +PacifidlogTown_House5_MapEvents:: map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 07da6a24dc..a70ac39920 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House5: @ 8482FFC +PacifidlogTown_House5: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 80c8a8c712..edc6e916f7 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 +PacifidlogTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 -PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 +PacifidlogTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F -PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00 +PacifidlogTown_PokemonCenter_1F_MapEvents:: map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 9db47a72be..39135ef6ac 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_PokemonCenter_1F: @ 8482F54 +PacifidlogTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index d41f1fa716..1d0e1a449c 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 +PacifidlogTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 +PacifidlogTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C +PacifidlogTown_PokemonCenter_2F_MapEvents:: map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index e16d7b5e53..a6c1609d32 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_PokemonCenter_2F: @ 8482F70 +PacifidlogTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index 96bd6cbce1..0c576c79f4 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -1,8 +1,8 @@ -PetalburgCity_MapConnectionsList: @ 84866D4 +PetalburgCity_MapConnectionsList: connection left, -50, MAP_ROUTE104 connection right, 10, MAP_ROUTE102 -PetalburgCity_MapConnections: @ 84866EC - .4byte 0x2 +PetalburgCity_MapConnections: + .4byte 2 .4byte PetalburgCity_MapConnectionsList diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 10d85c9392..83b3d227eb 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -1,4 +1,4 @@ -PetalburgCity_EventObjects: @ 8525FD0 +PetalburgCity_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 @@ -9,7 +9,7 @@ PetalburgCity_EventObjects: @ 8525FD0 object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT -PetalburgCity_MapWarps: @ 85260A8 +PetalburgCity_MapWarps: warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM @@ -17,7 +17,7 @@ PetalburgCity_MapWarps: @ 85260A8 warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART -PetalburgCity_MapCoordEvents: @ 85260D8 +PetalburgCity_MapCoordEvents: coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6 coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2 @@ -27,7 +27,7 @@ PetalburgCity_MapCoordEvents: @ 85260D8 coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3 -PetalburgCity_MapBGEvents: @ 8526158 +PetalburgCity_MapBGEvents: bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476 bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 @@ -37,6 +37,6 @@ PetalburgCity_MapBGEvents: @ 8526158 bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY -PetalburgCity_MapEvents:: @ 85261B8 +PetalburgCity_MapEvents:: map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 5cf3cc6e15..4aafc87a60 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,10 +1,10 @@ -PetalburgCity: @ 84824B8 +PetalburgCity: .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 - .2byte 1 + .2byte LAYOUT_PETALBURG_CITY .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index 4c75dc7f67..81b244f2ec 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_EventObjects: @ 852EDC8 +PetalburgCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 @@ -11,7 +11,7 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE -PetalburgCity_Gym_MapWarps: @ 852EED0 +PetalburgCity_Gym_MapWarps: warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM @@ -51,7 +51,7 @@ PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM -PetalburgCity_Gym_MapBGEvents: @ 852F000 +PetalburgCity_Gym_MapBGEvents: bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137 bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187 bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC @@ -67,6 +67,6 @@ PetalburgCity_Gym_MapBGEvents: @ 852F000 bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E -PetalburgCity_Gym_MapEvents:: @ 852F0A8 +PetalburgCity_Gym_MapEvents:: map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 626f37c3d7..d58d30b909 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_Gym: @ 8483034 +PetalburgCity_Gym: .4byte PetalburgCity_Gym_Layout .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 79 + .2byte LAYOUT_PETALBURG_CITY_GYM .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc index bcb91e6370..9a22e581d6 100644 --- a/data/maps/PetalburgCity_House1/events.inc +++ b/data/maps/PetalburgCity_House1/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_House1_EventObjects: @ 852F0BC +PetalburgCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 -PetalburgCity_House1_MapWarps: @ 852F0EC +PetalburgCity_House1_MapWarps: warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY -PetalburgCity_House1_MapEvents:: @ 852F0FC +PetalburgCity_House1_MapEvents:: map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 058d2ae6b9..7582e63369 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_House1: @ 8483050 +PetalburgCity_House1: .4byte House1_Layout .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc index 660f1efe3f..cc964b56c9 100644 --- a/data/maps/PetalburgCity_House2/events.inc +++ b/data/maps/PetalburgCity_House2/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_House2_EventObjects: @ 852F110 +PetalburgCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 -PetalburgCity_House2_MapWarps: @ 852F140 +PetalburgCity_House2_MapWarps: warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY -PetalburgCity_House2_MapEvents:: @ 852F150 +PetalburgCity_House2_MapEvents:: map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index d8ceeafbe6..36eb663c0e 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_House2: @ 848306C +PetalburgCity_House2: .4byte HouseWithBed_Layout .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc index b79aa5cb09..9cb05df7d7 100644 --- a/data/maps/PetalburgCity_Mart/events.inc +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -1,13 +1,13 @@ -PetalburgCity_Mart_EventObjects: @ 852F294 +PetalburgCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 -PetalburgCity_Mart_MapWarps: @ 852F2F4 +PetalburgCity_Mart_MapWarps: warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY -PetalburgCity_Mart_MapEvents:: @ 852F304 +PetalburgCity_Mart_MapEvents:: map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 757430cab1..e95fb35537 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_Mart: @ 84830C0 +PetalburgCity_Mart: .4byte Mart_Layout .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index 8a1de856d4..de02c8a8ee 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 +PetalburgCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 -PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC +PetalburgCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F -PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4 +PetalburgCity_PokemonCenter_1F_MapEvents:: map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 61b328753f..08ec4783fb 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_PokemonCenter_1F: @ 8483088 +PetalburgCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 08bd8f5243..49514363b3 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 +PetalburgCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 +PetalburgCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280 +PetalburgCity_PokemonCenter_2F_MapEvents:: map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index c6cacfc3a0..779a106b91 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_PokemonCenter_2F: @ 84830A4 +PetalburgCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index e30f3a487b..98487bd2ce 100644 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_WallysHouse_EventObjects: @ 852ED74 +PetalburgCity_WallysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 -PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 +PetalburgCity_WallysHouse_MapWarps: warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY -PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4 +PetalburgCity_WallysHouse_MapEvents:: map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 04b7236660..2c49b77f64 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_WallysHouse: @ 8483018 +PetalburgCity_WallysHouse: .4byte House2_Layout .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index b64e388854..95326cedfe 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,4 +1,4 @@ -PetalburgWoods_EventObjects: @ 85345E4 +PetalburgWoods_EventObjects: object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT @@ -13,7 +13,7 @@ PetalburgWoods_EventObjects: @ 85345E4 object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 -PetalburgWoods_MapWarps: @ 853471C +PetalburgWoods_MapWarps: warp_def 14, 5, 0, 2, MAP_ROUTE104 warp_def 15, 5, 0, 3, MAP_ROUTE104 warp_def 16, 38, 0, 4, MAP_ROUTE104 @@ -21,11 +21,11 @@ PetalburgWoods_MapWarps: @ 853471C warp_def 36, 38, 0, 6, MAP_ROUTE104 warp_def 37, 38, 0, 7, MAP_ROUTE104 -PetalburgWoods_MapCoordEvents: @ 853474C +PetalburgWoods_MapCoordEvents: coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7 coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079 -PetalburgWoods_MapBGEvents: @ 853476C +PetalburgWoods_MapBGEvents: bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 @@ -33,6 +33,6 @@ PetalburgWoods_MapBGEvents: @ 853476C bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 -PetalburgWoods_MapEvents:: @ 85347B4 +PetalburgWoods_MapEvents:: map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index e25f6f7507..530c2f2aa4 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,10 +1,10 @@ -PetalburgWoods: @ 8483FF4 +PetalburgWoods: .4byte PetalburgWoods_Layout .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 135 + .2byte LAYOUT_PETALBURG_WOODS .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 06c6588a94..44829f60d4 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,18 +1,18 @@ -RecordCorner_EventObjects: @ 8539DFC +RecordCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 -RecordCorner_MapWarps: @ 8539E14 +RecordCorner_MapWarps: warp_def 8, 9, 3, 127, MAP_NONE warp_def 9, 9, 3, 127, MAP_NONE warp_def 11, 9, 3, 127, MAP_NONE warp_def 10, 9, 3, 127, MAP_NONE -RecordCorner_MapCoordEvents: @ 8539E34 +RecordCorner_MapCoordEvents: coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C -RecordCorner_MapEvents:: @ 8539E74 +RecordCorner_MapEvents:: map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index c0864092b9..0a3254abdb 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,10 +1,10 @@ -RecordCorner: @ 8484D68 +RecordCorner: .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 223 + .2byte LAYOUT_RECORD_CORNER .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index f5f35e974c..32ee511a8f 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,8 +1,8 @@ -Route101_MapConnectionsList: @ 848680C +Route101_MapConnectionsList: connection up, 0, MAP_OLDALE_TOWN connection down, 0, MAP_LITTLEROOT_TOWN -Route101_MapConnections: @ 8486824 - .4byte 0x2 +Route101_MapConnections: + .4byte 2 .4byte Route101_MapConnectionsList diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 77ee2848f7..b14649cc0f 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,4 +1,4 @@ -Route101_EventObjects: @ 8527E98 +Route101_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG @@ -6,7 +6,7 @@ Route101_EventObjects: @ 8527E98 object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY -Route101_MapCoordEvents: @ 8527F28 +Route101_MapCoordEvents: coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E @@ -17,9 +17,9 @@ Route101_MapCoordEvents: @ 8527F28 coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A -Route101_MapBGEvents: @ 8527FB8 +Route101_MapBGEvents: bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D -Route101_MapEvents:: @ 8527FC4 +Route101_MapEvents:: map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 5a98f7e22f..b40de8df96 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,10 +1,10 @@ -Route101: @ 8482678 +Route101: .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections .2byte MUS_DOORO1 - .2byte 17 + .2byte LAYOUT_ROUTE101 .byte MAPSEC_ROUTE_101 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index 419cfeec95..1b76d47f5f 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,8 +1,8 @@ -Route102_MapConnectionsList: @ 848682C +Route102_MapConnectionsList: connection left, -10, MAP_PETALBURG_CITY connection right, 0, MAP_OLDALE_TOWN -Route102_MapConnections: @ 8486844 - .4byte 0x2 +Route102_MapConnections: + .4byte 2 .4byte Route102_MapConnectionsList diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index b2299feea9..65acbee41e 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,4 +1,4 @@ -Route102_EventObjects: @ 8527FD8 +Route102_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 @@ -9,10 +9,10 @@ Route102_EventObjects: @ 8527FD8 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 -Route102_MapBGEvents: @ 85280B0 +Route102_MapBGEvents: bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA -Route102_MapEvents:: @ 85280C8 +Route102_MapEvents:: map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 7a0fcacdab..6b5c24b0c6 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,10 +1,10 @@ -Route102: @ 8482694 +Route102: .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections .2byte MUS_DOORO1 - .2byte 18 + .2byte LAYOUT_ROUTE102 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 0759d872f4..cff488cf2e 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,8 +1,8 @@ -Route103_MapConnectionsList: @ 848684C +Route103_MapConnectionsList: connection down, 0, MAP_OLDALE_TOWN connection right, -60, MAP_ROUTE110 -Route103_MapConnections: @ 8486864 - .4byte 0x2 +Route103_MapConnections: + .4byte 2 .4byte Route103_MapConnectionsList diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index 5a6cc8866c..8794121571 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,4 +1,4 @@ -Route103_EventObjects: @ 85280DC +Route103_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 @@ -20,12 +20,12 @@ Route103_EventObjects: @ 85280DC object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP -Route103_MapWarps: @ 85282BC +Route103_MapWarps: warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE -Route103_MapBGEvents: @ 85282C4 +Route103_MapBGEvents: bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB -Route103_MapEvents:: @ 85282D0 +Route103_MapEvents:: map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index b614f32eb0..942ec632cb 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,10 +1,10 @@ -Route103: @ 84826B0 +Route103: .4byte Route103_Layout .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections .2byte MUS_DOORO1 - .2byte 19 + .2byte LAYOUT_ROUTE103 .byte MAPSEC_ROUTE_103 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index ce605c828f..193f898335 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,9 +1,9 @@ -Route104_MapConnectionsList: @ 848686C +Route104_MapConnectionsList: connection up, 0, MAP_RUSTBORO_CITY connection down, 0, MAP_ROUTE105 connection right, 50, MAP_PETALBURG_CITY -Route104_MapConnections: @ 8486890 - .4byte 0x3 +Route104_MapConnections: + .4byte 3 .4byte Route104_MapConnectionsList diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 53e868559d..8b67a0854a 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,4 +1,4 @@ -Route104_EventObjects: @ 85282E4 +Route104_EventObjects: object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 @@ -34,7 +34,7 @@ Route104_EventObjects: @ 85282E4 object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL -Route104_MapWarps: @ 8528614 +Route104_MapWarps: warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS @@ -44,10 +44,10 @@ Route104_MapWarps: @ 8528614 warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS -Route104_MapCoordEvents: @ 8528654 +Route104_MapCoordEvents: coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 -Route104_MapBGEvents: @ 8528664 +Route104_MapBGEvents: bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A @@ -59,6 +59,6 @@ Route104_MapBGEvents: @ 8528664 bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE -Route104_MapEvents:: @ 85286DC +Route104_MapEvents:: map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 101e690d5c..6f8e0776b7 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,10 +1,10 @@ -Route104: @ 84826CC +Route104: .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections .2byte MUS_NEXTROAD - .2byte 20 + .2byte LAYOUT_ROUTE104 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index daee7759a1..d1924756c3 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,11 +1,11 @@ -Route104_MrBrineysHouse_EventObjects: @ 8533AD4 +Route104_MrBrineysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO -Route104_MrBrineysHouse_MapWarps: @ 8533B04 +Route104_MrBrineysHouse_MapWarps: warp_def 5, 8, 0, 0, MAP_ROUTE104 warp_def 6, 8, 0, 0, MAP_ROUTE104 -Route104_MrBrineysHouse_MapEvents:: @ 8533B14 +Route104_MrBrineysHouse_MapEvents:: map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index c52a076de3..784db2d2da 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,10 +1,10 @@ -Route104_MrBrineysHouse: @ 8483D70 +Route104_MrBrineysHouse: .4byte Route104_MrBrineysHouse_Layout .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 102 + .2byte LAYOUT_ROUTE104_MR_BRINEYS_HOUSE .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index 52e57efc77..c33268ff65 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -1,12 +1,12 @@ -Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 +Route104_PrettyPetalFlowerShop_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 -Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 +Route104_PrettyPetalFlowerShop_MapWarps: warp_def 2, 8, 0, 1, MAP_ROUTE104 warp_def 3, 8, 0, 1, MAP_ROUTE104 -Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80 +Route104_PrettyPetalFlowerShop_MapEvents:: map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index eaf0735503..b201d0a3e5 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,10 +1,10 @@ -Route104_PrettyPetalFlowerShop: @ 8483D8C +Route104_PrettyPetalFlowerShop: .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 117 + .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index 08976e5a89..4f1dfef12a 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -1,3 +1,3 @@ -Route104_Prototype_MapEvents:: @ 853DDC0 +Route104_Prototype_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 0de3a4b478..7bc8d0a876 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,10 +1,10 @@ -Route104_Prototype: @ 8485AF8 +Route104_Prototype: .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD - .2byte 287 + .2byte LAYOUT_ROUTE104_PROTOTYPE .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc index e66b3c841c..76dd77e02a 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc @@ -1,3 +1,3 @@ -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 853DDD4 +Route104_PrototypePrettyPetalFlowerShop_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index e72f9a6060..53b543e4eb 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,10 +1,10 @@ -Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 +Route104_PrototypePrettyPetalFlowerShop: .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD - .2byte 117 + .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index ac03944b76..89c412cc6a 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,9 +1,9 @@ -Route105_MapConnectionsList: @ 8486898 +Route105_MapConnectionsList: connection up, 0, MAP_ROUTE104 connection down, 0, MAP_ROUTE106 connection dive, 0, MAP_UNDERWATER6 -Route105_MapConnections: @ 84868BC - .4byte 0x3 +Route105_MapConnections: + .4byte 3 .4byte Route105_MapConnectionsList diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index e22aa668cc..851a26fdc7 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,4 +1,4 @@ -Route105_EventObjects: @ 85286F0 +Route105_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 @@ -8,13 +8,13 @@ Route105_EventObjects: @ 85286F0 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 -Route105_MapWarps: @ 85287B0 +Route105_MapWarps: warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE -Route105_MapBGEvents: @ 85287B8 +Route105_MapBGEvents: bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL -Route105_MapEvents:: @ 85287D0 +Route105_MapEvents:: map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 5c6b2fc153..ac3e766dd1 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,10 +1,10 @@ -Route105: @ 84826E8 +Route105: .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections .2byte MUS_NEXTROAD - .2byte 21 + .2byte LAYOUT_ROUTE105 .byte MAPSEC_ROUTE_105 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index 18f181d2b2..f48a08bd80 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,8 +1,8 @@ -Route106_MapConnectionsList: @ 84868C4 +Route106_MapConnectionsList: connection up, 0, MAP_ROUTE105 connection down, 60, MAP_DEWFORD_TOWN -Route106_MapConnections: @ 84868DC - .4byte 0x2 +Route106_MapConnections: + .4byte 2 .4byte Route106_MapConnectionsList diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 9ff0f41dd7..6454fc188b 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,19 +1,19 @@ -Route106_EventObjects: @ 85287E4 +Route106_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN -Route106_MapWarps: @ 852885C +Route106_MapWarps: warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F -Route106_MapBGEvents: @ 8528864 +Route106_MapBGEvents: bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A -Route106_MapEvents:: @ 8528894 +Route106_MapEvents:: map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index f0f032b8b5..01c7b9ae6d 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,10 +1,10 @@ -Route106: @ 8482704 +Route106: .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections .2byte MUS_NEXTROAD - .2byte 22 + .2byte LAYOUT_ROUTE106 .byte MAPSEC_ROUTE_106 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index 04ad13b07a..d1bb18b873 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,8 +1,8 @@ -Route107_MapConnectionsList: @ 84868E4 +Route107_MapConnectionsList: connection left, 0, MAP_DEWFORD_TOWN connection right, 0, MAP_ROUTE108 -Route107_MapConnections: @ 84868FC - .4byte 0x2 +Route107_MapConnections: + .4byte 2 .4byte Route107_MapConnectionsList diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc index b67e98384c..461d8cd86c 100644 --- a/data/maps/Route107/events.inc +++ b/data/maps/Route107/events.inc @@ -1,4 +1,4 @@ -Route107_EventObjects: @ 85288A8 +Route107_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 @@ -7,6 +7,6 @@ Route107_EventObjects: @ 85288A8 object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 -Route107_MapEvents:: @ 8528950 +Route107_MapEvents:: map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index a4ec264ead..db53b811dd 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,10 +1,10 @@ -Route107: @ 8482720 +Route107: .4byte Route107_Layout .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections .2byte MUS_NEXTROAD - .2byte 23 + .2byte LAYOUT_ROUTE107 .byte MAPSEC_ROUTE_107 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index f80d0ade2c..9b2d0f1f90 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -1,8 +1,8 @@ -Route108_MapConnectionsList: @ 8486904 +Route108_MapConnectionsList: connection left, 0, MAP_ROUTE107 connection right, -40, MAP_ROUTE109 -Route108_MapConnections: @ 848691C - .4byte 0x2 +Route108_MapConnections: + .4byte 2 .4byte Route108_MapConnectionsList diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 094eb0bc78..9e1a088c08 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,4 +1,4 @@ -Route108_EventObjects: @ 8528964 +Route108_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 @@ -7,12 +7,12 @@ Route108_EventObjects: @ 8528964 object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE -Route108_MapWarps: @ 8528A0C +Route108_MapWarps: warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK -Route108_MapBGEvents: @ 8528A14 +Route108_MapBGEvents: bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY -Route108_MapEvents:: @ 8528A20 +Route108_MapEvents:: map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 106fe3135e..97d4a879d1 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -1,10 +1,10 @@ -Route108: @ 848273C +Route108: .4byte Route108_Layout .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections .2byte MUS_NEXTROAD - .2byte 24 + .2byte LAYOUT_ROUTE108 .byte MAPSEC_ROUTE_108 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 25a7a0e919..d74fc08ddf 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,8 +1,8 @@ -Route109_MapConnectionsList: @ 8486924 +Route109_MapConnectionsList: connection up, 0, MAP_SLATEPORT_CITY connection left, 40, MAP_ROUTE108 -Route109_MapConnections: @ 848693C - .4byte 0x2 +Route109_MapConnections: + .4byte 2 .4byte Route109_MapConnectionsList diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 89ee11bb3b..efd0e896fd 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,4 +1,4 @@ -Route109_EventObjects: @ 8528A34 +Route109_EventObjects: object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 @@ -24,10 +24,10 @@ Route109_EventObjects: @ 8528A34 object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 -Route109_MapWarps: @ 8528C74 +Route109_MapWarps: warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE -Route109_MapBGEvents: @ 8528C7C +Route109_MapBGEvents: bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE @@ -37,5 +37,6 @@ Route109_MapBGEvents: @ 8528C7C bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 -Route109_MapEvents:: @ 8528CDC +Route109_MapEvents:: map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents + diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 045f422567..9de12f3e68 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,10 +1,10 @@ -Route109: @ 8482758 +Route109: .4byte Route109_Layout .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections .2byte MUS_NEXTROAD - .2byte 25 + .2byte LAYOUT_ROUTE109 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc index 0632596a96..7ef23ad7f5 100644 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -1,13 +1,13 @@ -Route109_SeashoreHouse_EventObjects: @ 853DDE8 +Route109_SeashoreHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 -Route109_SeashoreHouse_MapWarps: @ 853DE48 +Route109_SeashoreHouse_MapWarps: warp_def 6, 9, 0, 0, MAP_ROUTE109 warp_def 7, 9, 0, 0, MAP_ROUTE109 -Route109_SeashoreHouse_MapEvents:: @ 853DE58 +Route109_SeashoreHouse_MapEvents:: map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 68dc54b777..d8109deaca 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,10 +1,10 @@ -Route109_SeashoreHouse: @ 8485B30 +Route109_SeashoreHouse: .4byte Route109_SeashoreHouse_Layout .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 243 + .2byte LAYOUT_ROUTE109_SEASHORE_HOUSE .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index 22000354f5..d0334b8c5c 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,9 +1,9 @@ -Route110_MapConnectionsList: @ 8486944 +Route110_MapConnectionsList: connection up, 0, MAP_MAUVILLE_CITY connection down, 0, MAP_SLATEPORT_CITY connection left, 60, MAP_ROUTE103 -Route110_MapConnections: @ 8486968 - .4byte 0x3 +Route110_MapConnections: + .4byte 3 .4byte Route110_MapConnectionsList diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index b50e5eec6d..349670c135 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -1,4 +1,4 @@ -Route110_EventObjects: @ 8528CF0 +Route110_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 @@ -36,7 +36,7 @@ Route110_EventObjects: @ 8528CF0 object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH -Route110_MapWarps: @ 8529050 +Route110_MapWarps: 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_SOUTH_ENTRANCE @@ -44,7 +44,7 @@ Route110_MapWarps: @ 8529050 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 +Route110_MapCoordEvents: coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D @@ -55,7 +55,7 @@ Route110_MapCoordEvents: @ 8529080 coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1 coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC -Route110_MapBGEvents: @ 8529110 +Route110_MapBGEvents: bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353 bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365 bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A @@ -74,6 +74,6 @@ Route110_MapBGEvents: @ 8529110 bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A -Route110_MapEvents:: @ 85291DC +Route110_MapEvents:: map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 14194cd37b..5edb81ec43 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,10 +1,10 @@ -Route110: @ 8482774 +Route110: .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections .2byte MUS_DOORO_X1 - .2byte 26 + .2byte LAYOUT_ROUTE110 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index ee7f5ef172..f9050259c1 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -1,16 +1,16 @@ -Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0 +Route110_SeasideCyclingRoadNorthEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 -Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 +Route110_SeasideCyclingRoadNorthEntrance_MapWarps: 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 +Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 -Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8 +Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: 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 index 50f4b763ff..008df77af3 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 +Route110_SeasideCyclingRoadNorthEntrance: .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 256 + .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 8d10ce4997..f64836526e 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -1,16 +1,16 @@ -Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C +Route110_SeasideCyclingRoadSouthEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 -Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 +Route110_SeasideCyclingRoadSouthEntrance_MapWarps: 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 +Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 -Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64 +Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: 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 index 4e09eeef32..be2646ee27 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C +Route110_SeasideCyclingRoadSouthEntrance: .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 256 + .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc index e9d84d56bd..814e46cbe9 100644 --- a/data/maps/Route110_TrickHouseCorridor/events.inc +++ b/data/maps/Route110_TrickHouseCorridor/events.inc @@ -1,9 +1,9 @@ -Route110_TrickHouseCorridor_MapWarps: @ 853DF54 +Route110_TrickHouseCorridor_MapWarps: warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE -Route110_TrickHouseCorridor_MapEvents:: @ 853DF74 +Route110_TrickHouseCorridor_MapEvents:: map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 6657162b76..2a60d20d8f 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseCorridor: @ 8485B84 +Route110_TrickHouseCorridor: .4byte Route110_TrickHouseCorridor_Layout .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 246 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 1e371bbbe1..82088646e1 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,16 +1,16 @@ -Route110_TrickHouseEnd_EventObjects: @ 853DEFC +Route110_TrickHouseEnd_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN -Route110_TrickHouseEnd_MapWarps: @ 853DF14 +Route110_TrickHouseEnd_MapWarps: warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR -Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 +Route110_TrickHouseEnd_MapCoordEvents: coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 -Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 +Route110_TrickHouseEnd_MapBGEvents: bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET -Route110_TrickHouseEnd_MapEvents:: @ 853DF40 +Route110_TrickHouseEnd_MapEvents:: map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 52a39914fe..0c2dfac3ad 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseEnd: @ 8485B68 +Route110_TrickHouseEnd: .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 245 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_END .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index ff83f0bdb5..791ecbbc54 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,20 +1,20 @@ -Route110_TrickHouseEntrance_EventObjects: @ 853DE6C +Route110_TrickHouseEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN -Route110_TrickHouseEntrance_MapWarps: @ 853DE84 +Route110_TrickHouseEntrance_MapWarps: warp_def 5, 7, 3, 1, MAP_ROUTE110 warp_def 6, 7, 3, 1, MAP_ROUTE110 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 -Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C +Route110_TrickHouseEntrance_MapCoordEvents: coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 -Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC +Route110_TrickHouseEntrance_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 -Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8 +Route110_TrickHouseEntrance_MapEvents:: map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 4e651e5f97..0f5f0aad59 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseEntrance: @ 8485B4C +Route110_TrickHouseEntrance: .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 244 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 02dfa58bc7..3a2bb131c6 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 +Route110_TrickHousePuzzle1_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 @@ -15,14 +15,14 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E -Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 +Route110_TrickHousePuzzle1_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 +Route110_TrickHousePuzzle1_MapBGEvents: bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B -Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 +Route110_TrickHousePuzzle1_MapEvents:: map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index de4ff3ed2e..5835faa5fd 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle1: @ 8485BA0 +Route110_TrickHousePuzzle1: .4byte Route110_TrickHousePuzzle1_Layout .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 247 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index e49d391e64..c56d53dea0 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -1,24 +1,24 @@ -Route110_TrickHousePuzzle2_EventObjects: @ 853E128 +Route110_TrickHousePuzzle2_EventObjects: object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL -Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 +Route110_TrickHousePuzzle2_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 +Route110_TrickHousePuzzle2_MapCoordEvents: coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 -Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 +Route110_TrickHousePuzzle2_MapBGEvents: bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 -Route110_TrickHousePuzzle2_MapEvents:: @ 853E204 +Route110_TrickHousePuzzle2_MapEvents:: map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 8a2b708ea4..b957dac781 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle2: @ 8485BBC +Route110_TrickHousePuzzle2: .4byte Route110_TrickHousePuzzle2_Layout .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 248 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 1186670763..6e3406753f 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle3_EventObjects: @ 853E218 +Route110_TrickHousePuzzle3_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 @@ -7,20 +7,20 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15 object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16 -Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 +Route110_TrickHousePuzzle3_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 +Route110_TrickHousePuzzle3_MapCoordEvents: coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 -Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 +Route110_TrickHousePuzzle3_MapBGEvents: bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 -Route110_TrickHousePuzzle3_MapEvents:: @ 853E324 +Route110_TrickHousePuzzle3_MapEvents:: map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 37a517f72f..b367f850e3 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle3: @ 8485BD8 +Route110_TrickHousePuzzle3: .4byte Route110_TrickHousePuzzle3_Layout .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 249 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 4bad58814a..c2de17b66f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle4_EventObjects: @ 853E338 +Route110_TrickHousePuzzle4_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 @@ -14,14 +14,14 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19 object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A -Route110_TrickHousePuzzle4_MapWarps: @ 853E488 +Route110_TrickHousePuzzle4_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 +Route110_TrickHousePuzzle4_MapBGEvents: bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 -Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC +Route110_TrickHousePuzzle4_MapEvents:: map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 993f002d70..9f3f637b9f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle4: @ 8485BF4 +Route110_TrickHousePuzzle4: .4byte Route110_TrickHousePuzzle4_Layout .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 250 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index f91d26f4db..88eebe092d 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -1,16 +1,16 @@ -Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 +Route110_TrickHousePuzzle5_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 -Route110_TrickHousePuzzle5_MapWarps: @ 853E538 +Route110_TrickHousePuzzle5_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 +Route110_TrickHousePuzzle5_MapCoordEvents: coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF @@ -34,9 +34,9 @@ Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 -Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 +Route110_TrickHousePuzzle5_MapBGEvents: bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 -Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC +Route110_TrickHousePuzzle5_MapEvents:: map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index b22b21bcef..e179a016a7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle5: @ 8485C10 +Route110_TrickHousePuzzle5: .4byte Route110_TrickHousePuzzle5_Layout .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 251 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index f172622eae..512164dba3 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -1,17 +1,17 @@ -Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 +Route110_TrickHousePuzzle6_EventObjects: object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL -Route110_TrickHousePuzzle6_MapWarps: @ 853E730 +Route110_TrickHousePuzzle6_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 +Route110_TrickHousePuzzle6_MapBGEvents: bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 -Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 +Route110_TrickHousePuzzle6_MapEvents:: map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index e10fd78b23..ec7a42d200 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle6: @ 8485C2C +Route110_TrickHousePuzzle6: .4byte Route110_TrickHousePuzzle6_Layout .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 252 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index d29c76263f..4dff66e1c9 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle7_EventObjects: @ 853E768 +Route110_TrickHousePuzzle7_EventObjects: object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 @@ -9,7 +9,7 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -Route110_TrickHousePuzzle7_MapWarps: @ 853E840 +Route110_TrickHousePuzzle7_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END @@ -24,15 +24,15 @@ Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 -Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 +Route110_TrickHousePuzzle7_MapCoordEvents: coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331 coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347 coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D -Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 +Route110_TrickHousePuzzle7_MapBGEvents: bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 -Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4 +Route110_TrickHousePuzzle7_MapEvents:: map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 40f43f9d84..ca21629e35 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle7: @ 8485C48 +Route110_TrickHousePuzzle7: .4byte Route110_TrickHousePuzzle7_Layout .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 253 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index 909c8cbfd7..2ccba5addd 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -1,17 +1,17 @@ -Route110_TrickHousePuzzle8_EventObjects: @ 853E908 +Route110_TrickHousePuzzle8_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL -Route110_TrickHousePuzzle8_MapWarps: @ 853E968 +Route110_TrickHousePuzzle8_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 +Route110_TrickHousePuzzle8_MapBGEvents: bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 -Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C +Route110_TrickHousePuzzle8_MapEvents:: map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 1755152924..1bf3fbb1cb 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle8: @ 8485C64 +Route110_TrickHousePuzzle8: .4byte Route110_TrickHousePuzzle8_Layout .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 254 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 6a57d275e3..25e4099761 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,9 +1,9 @@ -Route111_MapConnectionsList: @ 8486970 +Route111_MapConnectionsList: connection down, 0, MAP_MAUVILLE_CITY connection left, 0, MAP_ROUTE113 connection left, 20, MAP_ROUTE112 -Route111_MapConnections: @ 8486994 - .4byte 0x3 +Route111_MapConnections: + .4byte 3 .4byte Route111_MapConnectionsList diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 975141b73f..703c9a6627 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,4 +1,4 @@ -Route111_EventObjects: @ 85291F0 +Route111_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE @@ -46,14 +46,14 @@ Route111_EventObjects: @ 85291F0 object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY -Route111_MapWarps: @ 8529640 +Route111_MapWarps: warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE warp_def 29, 87, 0, 0, MAP_DESERT_RUINS warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE -Route111_MapCoordEvents: @ 8529668 +Route111_MapCoordEvents: coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A @@ -89,7 +89,7 @@ Route111_MapCoordEvents: @ 8529668 coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD -Route111_MapBGEvents: @ 8529888 +Route111_MapBGEvents: bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153 bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165 @@ -109,6 +109,6 @@ Route111_MapBGEvents: @ 8529888 bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C -Route111_MapEvents:: @ 8529960 +Route111_MapEvents:: map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index cb975e74a3..2ec5fc6edf 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,10 +1,10 @@ -Route111: @ 8482790 +Route111: .4byte Route111_Layout .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections .2byte MUS_DOORO_X1 - .2byte 27 + .2byte LAYOUT_ROUTE111 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc index 9738378710..fbdd2e5ddd 100644 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop_EventObjects: @ 8533C18 +Route111_OldLadysRestStop_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 -Route111_OldLadysRestStop_MapWarps: @ 8533C30 +Route111_OldLadysRestStop_MapWarps: warp_def 3, 7, 0, 2, MAP_ROUTE111 warp_def 4, 7, 0, 2, MAP_ROUTE111 -Route111_OldLadysRestStop_MapEvents:: @ 8533C40 +Route111_OldLadysRestStop_MapEvents:: map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index a3c2a0161a..9b2633050c 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop: @ 8483DC4 +Route111_OldLadysRestStop: .4byte House3_Layout .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index edaf85eb45..b433e1198e 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -1,13 +1,13 @@ -Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 +Route111_WinstrateFamilysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 -Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 +Route111_WinstrateFamilysHouse_MapWarps: warp_def 3, 7, 0, 0, MAP_ROUTE111 warp_def 4, 7, 0, 0, MAP_ROUTE111 -Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04 +Route111_WinstrateFamilysHouse_MapEvents:: map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 12e4080890..d37a62e00a 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,10 +1,10 @@ -Route111_WinstrateFamilysHouse: @ 8483DA8 +Route111_WinstrateFamilysHouse: .4byte House2_Layout .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index 132c4ff76e..0fc8da215d 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,9 +1,9 @@ -Route112_MapConnectionsList: @ 848699C +Route112_MapConnectionsList: connection up, -60, MAP_ROUTE113 connection left, 40, MAP_LAVARIDGE_TOWN connection right, -20, MAP_ROUTE111 -Route112_MapConnections: @ 84869C0 - .4byte 0x3 +Route112_MapConnections: + .4byte 3 .4byte Route112_MapConnectionsList diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index cfa145e976..4d1b338c3a 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,4 +1,4 @@ -Route112_EventObjects: @ 8529974 +Route112_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 @@ -14,7 +14,7 @@ Route112_EventObjects: @ 8529974 object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 -Route112_MapWarps: @ 8529AC4 +Route112_MapWarps: warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION warp_def 6, 46, 3, 0, MAP_JAGGED_PASS @@ -22,11 +22,11 @@ Route112_MapWarps: @ 8529AC4 warp_def 11, 36, 0, 0, MAP_FIERY_PATH warp_def 22, 10, 0, 1, MAP_FIERY_PATH -Route112_MapBGEvents: @ 8529AF4 +Route112_MapBGEvents: bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 -Route112_MapEvents:: @ 8529B18 +Route112_MapEvents:: map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 70e0f2d65a..1cc8583a5b 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,10 +1,10 @@ -Route112: @ 84827AC +Route112: .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections .2byte MUS_DOORO_X1 - .2byte 28 + .2byte LAYOUT_ROUTE112 .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc index 2fe0846971..4b51decda7 100644 --- a/data/maps/Route112_CableCarStation/events.inc +++ b/data/maps/Route112_CableCarStation/events.inc @@ -1,11 +1,11 @@ -Route112_CableCarStation_EventObjects: @ 8533C54 +Route112_CableCarStation_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 -Route112_CableCarStation_MapWarps: @ 8533C84 +Route112_CableCarStation_MapWarps: warp_def 6, 11, 0, 0, MAP_ROUTE112 warp_def 7, 11, 0, 1, MAP_ROUTE112 -Route112_CableCarStation_MapEvents:: @ 8533C94 +Route112_CableCarStation_MapEvents:: map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index fd9038c12f..f1a00b968d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,10 +1,10 @@ -Route112_CableCarStation: @ 8483DE0 +Route112_CableCarStation: .4byte CableCarStation_Layout .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 .2byte MUS_DOORO_X1 - .2byte 118 + .2byte LAYOUT_CABLE_CAR_STATION .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index 3067ee23be..a4d583ce89 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,9 +1,9 @@ -Route113_MapConnectionsList: @ 84869C8 +Route113_MapConnectionsList: connection down, 60, MAP_ROUTE112 connection left, 0, MAP_FALLARBOR_TOWN connection right, 0, MAP_ROUTE111 -Route113_MapConnections: @ 84869EC - .4byte 0x3 +Route113_MapConnections: + .4byte 3 .4byte Route113_MapConnectionsList diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index b2481d6ed1..bcf377e744 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -1,4 +1,4 @@ -Route113_EventObjects: @ 8529B2C +Route113_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 @@ -16,12 +16,12 @@ Route113_EventObjects: @ 8529B2C object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 -Route113_MapWarps: @ 8529CAC +Route113_MapWarps: warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route113_MapCoordEvents: @ 8529CC4 +Route113_MapCoordEvents: coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH @@ -42,7 +42,7 @@ Route113_MapCoordEvents: @ 8529CC4 coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH -Route113_MapBGEvents: @ 8529DF4 +Route113_MapBGEvents: bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 @@ -52,6 +52,6 @@ Route113_MapBGEvents: @ 8529DF4 bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET -Route113_MapEvents:: @ 8529E54 +Route113_MapEvents:: map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index deaacca366..aae60a1002 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,10 +1,10 @@ -Route113: @ 84827C8 +Route113: .4byte Route113_Layout .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections .2byte MUS_KAZANBAI - .2byte 29 + .2byte LAYOUT_ROUTE113 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc index d6f9c0d4bc..7c8fbe7178 100644 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -1,11 +1,11 @@ -Route113_GlassWorkshop_EventObjects: @ 853EA78 +Route113_GlassWorkshop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 -Route113_GlassWorkshop_MapWarps: @ 853EAA8 +Route113_GlassWorkshop_MapWarps: warp_def 3, 8, 0, 0, MAP_ROUTE113 warp_def 4, 8, 0, 0, MAP_ROUTE113 -Route113_GlassWorkshop_MapEvents:: @ 853EAB8 +Route113_GlassWorkshop_MapEvents:: map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 44a87e5efe..e77f3acc81 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,10 +1,10 @@ -Route113_GlassWorkshop: @ 8485CB8 +Route113_GlassWorkshop: .4byte House4_Layout .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 67 + .2byte LAYOUT_HOUSE4 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 760c2ddc00..5c7671c7c0 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,8 +1,8 @@ -Route114_MapConnectionsList: @ 84869F4 +Route114_MapConnectionsList: connection left, 40, MAP_ROUTE115 connection right, 0, MAP_FALLARBOR_TOWN -Route114_MapConnections: @ 8486A0C - .4byte 0x2 +Route114_MapConnections: + .4byte 2 .4byte Route114_MapConnectionsList diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 55ea12195d..9f17b54c03 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -1,4 +1,4 @@ -Route114_EventObjects: @ 8529E68 +Route114_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 @@ -27,14 +27,14 @@ Route114_EventObjects: @ 8529E68 object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 -Route114_MapWarps: @ 852A0F0 +Route114_MapWarps: warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route114_MapBGEvents: @ 852A118 +Route114_MapBGEvents: bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 @@ -48,6 +48,6 @@ Route114_MapBGEvents: @ 852A118 bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE -Route114_MapEvents:: @ 852A1A8 +Route114_MapEvents:: map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index 318efdbaf9..7177662e61 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,10 +1,10 @@ -Route114: @ 84827E4 +Route114: .4byte Route114_Layout .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections .2byte MUS_DOORO_X1 - .2byte 30 + .2byte LAYOUT_ROUTE114 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 9c4579c1d1..dd3be1a66a 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -1,17 +1,17 @@ -Route114_FossilManiacsHouse_EventObjects: @ 8533CFC +Route114_FossilManiacsHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 -Route114_FossilManiacsHouse_MapWarps: @ 8533D14 +Route114_FossilManiacsHouse_MapWarps: warp_def 4, 7, 0, 1, MAP_ROUTE114 warp_def 5, 7, 0, 1, MAP_ROUTE114 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL -Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C +Route114_FossilManiacsHouse_MapBGEvents: bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C -Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C +Route114_FossilManiacsHouse_MapEvents:: map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index ca042d6b4e..648359c8fe 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,10 +1,10 @@ -Route114_FossilManiacsHouse: @ 8483E18 +Route114_FossilManiacsHouse: .4byte Route114_FossilManiacsHouse_Layout .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 119 + .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index ba3798f7b8..ec9551959c 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -1,15 +1,15 @@ -Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 +Route114_FossilManiacsTunnel_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 -Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 +Route114_FossilManiacsTunnel_MapWarps: warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS -Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 +Route114_FossilManiacsTunnel_MapCoordEvents: coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 -Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0 +Route114_FossilManiacsTunnel_MapEvents:: map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index be53b84cea..9012e1d402 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,10 +1,10 @@ -Route114_FossilManiacsTunnel: @ 8483E34 +Route114_FossilManiacsTunnel: .4byte Route114_FossilManiacsTunnel_Layout .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 120 + .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 17030ddc19..ccd0828514 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,15 +1,15 @@ -Route114_LanettesHouse_EventObjects: @ 8533DD4 +Route114_LanettesHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE -Route114_LanettesHouse_MapWarps: @ 8533DEC +Route114_LanettesHouse_MapWarps: warp_def 5, 7, 0, 2, MAP_ROUTE114 warp_def 6, 7, 0, 2, MAP_ROUTE114 -Route114_LanettesHouse_MapBGEvents: @ 8533DFC +Route114_LanettesHouse_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309 bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 -Route114_LanettesHouse_MapEvents:: @ 8533E20 +Route114_LanettesHouse_MapEvents:: map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 51023a8006..7b5b949636 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,10 +1,10 @@ -Route114_LanettesHouse: @ 8483E50 +Route114_LanettesHouse: .4byte Route114_LanettesHouse_Layout .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 121 + .2byte LAYOUT_ROUTE114_LANETTES_HOUSE .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 4518e31fab..a569fd0b57 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,8 +1,8 @@ -Route115_MapConnectionsList: @ 8486A14 +Route115_MapConnectionsList: connection down, 0, MAP_RUSTBORO_CITY connection right, -40, MAP_ROUTE114 -Route115_MapConnections: @ 8486A2C - .4byte 0x2 +Route115_MapConnections: + .4byte 2 .4byte Route115_MapConnectionsList diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 18179deb16..517711bd5f 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -1,4 +1,4 @@ -Route115_EventObjects: @ 852A1BC +Route115_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 @@ -23,12 +23,12 @@ Route115_EventObjects: @ 852A1BC object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER -Route115_MapWarps: @ 852A3E4 +Route115_MapWarps: warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route115_MapBGEvents: @ 852A3FC +Route115_MapBGEvents: bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C @@ -44,6 +44,6 @@ Route115_MapBGEvents: @ 852A3FC bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE -Route115_MapEvents:: @ 852A4A4 +Route115_MapEvents:: map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 70e831aeec..fd3f9b2fc5 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,10 +1,10 @@ -Route115: @ 8482800 +Route115: .4byte Route115_Layout .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections .2byte MUS_NEXTROAD - .2byte 31 + .2byte LAYOUT_ROUTE115 .byte MAPSEC_ROUTE_115 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index fef193c0fc..bbf03097c2 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,8 +1,8 @@ -Route116_MapConnectionsList: @ 8486A34 +Route116_MapConnectionsList: connection down, 80, MAP_VERDANTURF_TOWN connection left, 0, MAP_RUSTBORO_CITY -Route116_MapConnections: @ 8486A4C - .4byte 0x2 +Route116_MapConnections: + .4byte 2 .4byte Route116_MapConnectionsList diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 37c54eb7ed..29566f515c 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -1,4 +1,4 @@ -Route116_EventObjects: @ 852A4B8 +Route116_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 @@ -28,17 +28,17 @@ Route116_EventObjects: @ 852A4B8 object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 -Route116_MapWarps: @ 852A758 +Route116_MapWarps: warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route116_MapCoordEvents: @ 852A780 +Route116_MapCoordEvents: coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 -Route116_MapBGEvents: @ 852A790 +Route116_MapBGEvents: bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57 bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60 bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69 @@ -51,6 +51,6 @@ Route116_MapBGEvents: @ 852A790 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES -Route116_MapEvents:: @ 852A814 +Route116_MapEvents:: map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index e97885bc78..d4688d63a9 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,10 +1,10 @@ -Route116: @ 848281C +Route116: .4byte Route116_Layout .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections .2byte MUS_NEXTROAD - .2byte 32 + .2byte LAYOUT_ROUTE116 .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 32a4dc0ea0..5ecd36317c 100644 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -1,12 +1,12 @@ -Route116_TunnelersRestHouse_EventObjects: @ 8533E34 +Route116_TunnelersRestHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 -Route116_TunnelersRestHouse_MapWarps: @ 8533E7C +Route116_TunnelersRestHouse_MapWarps: warp_def 4, 8, 0, 1, MAP_ROUTE116 warp_def 5, 8, 0, 1, MAP_ROUTE116 -Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C +Route116_TunnelersRestHouse_MapEvents:: map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 1c3abde780..f50a13c93d 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,10 +1,10 @@ -Route116_TunnelersRestHouse: @ 8483E6C +Route116_TunnelersRestHouse: .4byte Route116_TunnelersRestHouse_Layout .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 122 + .2byte LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index 2780eac5a4..101690881b 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,8 +1,8 @@ -Route117_MapConnectionsList: @ 8486A54 +Route117_MapConnectionsList: connection left, 0, MAP_VERDANTURF_TOWN connection right, 0, MAP_MAUVILLE_CITY -Route117_MapConnections: @ 8486A6C - .4byte 0x2 +Route117_MapConnections: + .4byte 2 .4byte Route117_MapConnectionsList diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 4cede4040c..217068cd39 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -1,4 +1,4 @@ -Route117_EventObjects: @ 852A828 +Route117_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0 @@ -24,15 +24,15 @@ Route117_EventObjects: @ 852A828 object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 -Route117_MapWarps: @ 852AA68 +Route117_MapWarps: warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE -Route117_MapBGEvents: @ 852AA70 +Route117_MapBGEvents: bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL -Route117_MapEvents:: @ 852AAA0 +Route117_MapEvents:: map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 1d5eda074a..4ae1b92e55 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,10 +1,10 @@ -Route117: @ 8482838 +Route117: .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections .2byte MUS_DOORO_X1 - .2byte 33 + .2byte LAYOUT_ROUTE117 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc index 37a9db0f2d..6b5d2cc7ae 100644 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare_EventObjects: @ 8533EA0 +Route117_PokemonDayCare_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 -Route117_PokemonDayCare_MapWarps: @ 8533EB8 +Route117_PokemonDayCare_MapWarps: warp_def 2, 8, 0, 0, MAP_ROUTE117 warp_def 3, 8, 0, 0, MAP_ROUTE117 -Route117_PokemonDayCare_MapEvents:: @ 8533EC8 +Route117_PokemonDayCare_MapEvents:: map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index ba48de2288..827464a750 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare: @ 8483E88 +Route117_PokemonDayCare: .4byte Route117_PokemonDayCare_Layout .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 123 + .2byte LAYOUT_ROUTE117_POKEMON_DAY_CARE .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index 8069f036e1..54ecf15774 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,9 +1,9 @@ -Route118_MapConnectionsList: @ 8486A74 +Route118_MapConnectionsList: connection up, 40, MAP_ROUTE119 connection left, 0, MAP_MAUVILLE_CITY connection right, 0, MAP_ROUTE123 -Route118_MapConnections: @ 8486A98 - .4byte 0x3 +Route118_MapConnections: + .4byte 3 .4byte Route118_MapConnectionsList diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index fe131549fe..3dea1c6f66 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -1,4 +1,4 @@ -Route118_EventObjects: @ 852AAB4 +Route118_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 @@ -21,16 +21,16 @@ Route118_EventObjects: @ 852AAB4 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 -Route118_MapWarps: @ 852ACAC +Route118_MapWarps: warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route118_MapCoordEvents: @ 852ACBC +Route118_MapCoordEvents: coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4 -Route118_MapBGEvents: @ 852ACEC +Route118_MapBGEvents: bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85 @@ -41,6 +41,6 @@ Route118_MapBGEvents: @ 852ACEC bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE -Route118_MapEvents:: @ 852AD58 +Route118_MapEvents:: map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index e0b5416432..d38319d965 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,10 +1,10 @@ -Route118: @ 8482854 +Route118: .4byte Route118_Layout .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections .2byte MUS_ROUTE_118 - .2byte 34 + .2byte LAYOUT_ROUTE118 .byte MAPSEC_ROUTE_118 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 4987e049e2..067db34f13 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,8 +1,8 @@ -Route119_MapConnectionsList: @ 8486AA0 +Route119_MapConnectionsList: connection down, -40, MAP_ROUTE118 connection right, 0, MAP_FORTREE_CITY -Route119_MapConnections: @ 8486AB8 - .4byte 0x2 +Route119_MapConnections: + .4byte 2 .4byte Route119_MapConnectionsList diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 86ec2d2be3..9942a4c4f4 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -1,4 +1,4 @@ -Route119_EventObjects: @ 852AD6C +Route119_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0 @@ -43,11 +43,11 @@ Route119_EventObjects: @ 852AD6C object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2 object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT -Route119_MapWarps: @ 852B174 +Route119_MapWarps: warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE -Route119_MapCoordEvents: @ 852B184 +Route119_MapCoordEvents: coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472 coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE @@ -72,7 +72,7 @@ Route119_MapCoordEvents: @ 852B184 coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE -Route119_MapBGEvents: @ 852B2F4 +Route119_MapBGEvents: bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774 bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 @@ -94,6 +94,6 @@ Route119_MapBGEvents: @ 852B2F4 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 -Route119_MapEvents:: @ 852B3E4 +Route119_MapEvents:: map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 7181f6b0d5..0e3685b373 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,10 +1,10 @@ -Route119: @ 8482870 +Route119: .4byte Route119_Layout .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections .2byte MUS_GRANROAD - .2byte 35 + .2byte LAYOUT_ROUTE119 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc index aff8116a7a..152deabee0 100644 --- a/data/maps/Route119_House/events.inc +++ b/data/maps/Route119_House/events.inc @@ -1,4 +1,4 @@ -Route119_House_EventObjects: @ 853ECD0 +Route119_House_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 @@ -7,10 +7,10 @@ Route119_House_EventObjects: @ 853ECD0 object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 -Route119_House_MapWarps: @ 853ED78 +Route119_House_MapWarps: warp_def 3, 8, 0, 1, MAP_ROUTE119 warp_def 4, 8, 0, 1, MAP_ROUTE119 -Route119_House_MapEvents:: @ 853ED88 +Route119_House_MapEvents:: map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 334b858ecc..d7bbbd5ffb 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,10 +1,10 @@ -Route119_House: @ 8485D28 +Route119_House: .4byte House1_Layout .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 6d72fea9ca..e8f3b93f80 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,21 +1,21 @@ -Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 +Route119_WeatherInstitute_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 -Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 +Route119_WeatherInstitute_1F_MapWarps: warp_def 9, 12, 0, 0, MAP_ROUTE119 warp_def 10, 12, 0, 0, MAP_ROUTE119 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F -Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 +Route119_WeatherInstitute_1F_MapBGEvents: bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 -Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0 +Route119_WeatherInstitute_1F_MapEvents:: map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index e5e7abbc98..be2fe1617c 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,10 +1,10 @@ -Route119_WeatherInstitute_1F: @ 8485CF0 +Route119_WeatherInstitute_1F: .4byte Route119_WeatherInstitute_1F_Layout .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 271 + .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index d2cc64d402..7463848207 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,4 +1,4 @@ -Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 +Route119_WeatherInstitute_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA @@ -8,9 +8,9 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA -Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 +Route119_WeatherInstitute_2F_MapWarps: warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F -Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC +Route119_WeatherInstitute_2F_MapEvents:: map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index c81f9731c7..8543b0ed8b 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,10 +1,10 @@ -Route119_WeatherInstitute_2F: @ 8485D0C +Route119_WeatherInstitute_2F: .4byte Route119_WeatherInstitute_2F_Layout .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 272 + .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index c599e6a2cc..9dda2ecade 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,8 +1,8 @@ -Route120_MapConnectionsList: @ 8486AC0 +Route120_MapConnectionsList: connection left, 0, MAP_FORTREE_CITY connection right, 80, MAP_ROUTE121 -Route120_MapConnections: @ 8486AD8 - .4byte 0x2 +Route120_MapConnections: + .4byte 2 .4byte Route120_MapConnectionsList diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 24b2890606..d198dff3c7 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -1,4 +1,4 @@ -Route120_EventObjects: @ 852B3F8 +Route120_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0 @@ -44,11 +44,11 @@ Route120_EventObjects: @ 852B3F8 object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE -Route120_MapWarps: @ 852B818 +Route120_MapWarps: warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB -Route120_MapCoordEvents: @ 852B828 +Route120_MapCoordEvents: coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT @@ -69,7 +69,7 @@ Route120_MapCoordEvents: @ 852B828 coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS -Route120_MapBGEvents: @ 852B958 +Route120_MapBGEvents: bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5 bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 @@ -85,6 +85,6 @@ Route120_MapBGEvents: @ 852B958 bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 -Route120_MapEvents:: @ 852BA00 +Route120_MapEvents:: map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 626b57a94d..4d48d8b334 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,10 +1,10 @@ -Route120: @ 848288C +Route120: .4byte Route120_Layout .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections .2byte MUS_DOORO_X3 - .2byte 36 + .2byte LAYOUT_ROUTE120 .byte MAPSEC_ROUTE_120 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index 94116a03e0..6d9bd9ae4b 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,9 +1,9 @@ -Route121_MapConnectionsList: @ 8486AE0 +Route121_MapConnectionsList: connection down, 20, MAP_ROUTE122 connection left, -80, MAP_ROUTE120 connection right, -10, MAP_LILYCOVE_CITY -Route121_MapConnections: @ 8486B04 - .4byte 0x3 +Route121_MapConnections: + .4byte 3 .4byte Route121_MapConnectionsList diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 432071ed1c..5e637bb7e7 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,4 +1,4 @@ -Route121_EventObjects: @ 852BA14 +Route121_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 @@ -29,16 +29,16 @@ Route121_EventObjects: @ 852BA14 object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC -Route121_MapWarps: @ 852BCCC +Route121_MapWarps: warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE -Route121_MapCoordEvents: @ 852BCD4 +Route121_MapCoordEvents: coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 -Route121_MapBGEvents: @ 852BD14 +Route121_MapBGEvents: bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 @@ -50,6 +50,6 @@ Route121_MapBGEvents: @ 852BD14 bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE -Route121_MapEvents:: @ 852BD8C +Route121_MapEvents:: map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 3f070c2ec0..04cee69427 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,10 +1,10 @@ -Route121: @ 84828A8 +Route121: .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections .2byte MUS_DOORO_X3 - .2byte 37 + .2byte LAYOUT_ROUTE121 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 658be476f8..73c836cff7 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -1,20 +1,20 @@ -Route121_SafariZoneEntrance_EventObjects: @ 8533EDC +Route121_SafariZoneEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 -Route121_SafariZoneEntrance_MapWarps: @ 8533F24 +Route121_SafariZoneEntrance_MapWarps: warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH warp_def 14, 13, 0, 0, MAP_ROUTE121 warp_def 15, 13, 0, 0, MAP_ROUTE121 -Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 +Route121_SafariZoneEntrance_MapCoordEvents: coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 -Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 +Route121_SafariZoneEntrance_MapBGEvents: bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 -Route121_SafariZoneEntrance_MapEvents:: @ 8533F60 +Route121_SafariZoneEntrance_MapEvents:: map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index fa645a6934..b23cdecccc 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,10 +1,10 @@ -Route121_SafariZoneEntrance: @ 8483EA4 +Route121_SafariZoneEntrance: .4byte Route121_SafariZoneEntrance_Layout .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 124 + .2byte LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 2a0442a05e..a5a9f4fd66 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,8 +1,8 @@ -Route122_MapConnectionsList: @ 8486B0C +Route122_MapConnectionsList: connection up, -20, MAP_ROUTE121 connection down, -100, MAP_ROUTE123 -Route122_MapConnections: @ 8486B24 - .4byte 0x2 +Route122_MapConnections: + .4byte 2 .4byte Route122_MapConnectionsList diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc index 4c5b9b4647..8eb4dbb2c8 100644 --- a/data/maps/Route122/events.inc +++ b/data/maps/Route122/events.inc @@ -1,6 +1,6 @@ -Route122_MapWarps: @ 852BDA0 +Route122_MapWarps: warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F -Route122_MapEvents:: @ 852BDA8 +Route122_MapEvents:: map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index eddd1a2347..941fff7a36 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,10 +1,10 @@ -Route122: @ 84828C4 +Route122: .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections .2byte MUS_DOORO_X4 - .2byte 38 + .2byte LAYOUT_ROUTE122 .byte MAPSEC_ROUTE_122 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index 616c365ef3..e2125c9117 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,8 +1,8 @@ -Route123_MapConnectionsList: @ 8486B2C +Route123_MapConnectionsList: connection up, 100, MAP_ROUTE122 connection left, 0, MAP_ROUTE118 -Route123_MapConnections: @ 8486B44 - .4byte 0x2 +Route123_MapConnections: + .4byte 2 .4byte Route123_MapConnectionsList diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index d45ac0222f..2584ebbd36 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -1,4 +1,4 @@ -Route123_EventObjects: @ 852BDBC +Route123_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0 @@ -43,10 +43,10 @@ Route123_EventObjects: @ 852BDBC object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB -Route123_MapWarps: @ 852C1C4 +Route123_MapWarps: warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE -Route123_MapCoordEvents: @ 852C1CC +Route123_MapCoordEvents: coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE @@ -70,7 +70,7 @@ Route123_MapCoordEvents: @ 852C1CC coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE -Route123_MapBGEvents: @ 852C32C +Route123_MapBGEvents: bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3 bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 @@ -83,6 +83,6 @@ Route123_MapBGEvents: @ 852C32C bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY -Route123_MapEvents:: @ 852C3B0 +Route123_MapEvents:: map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index a215c35923..2a0120cfd9 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,10 +1,10 @@ -Route123: @ 84828E0 +Route123: .4byte Route123_Layout .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections .2byte MUS_DOORO_X4 - .2byte 39 + .2byte LAYOUT_ROUTE123 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc index 3462054cbe..4ad6c2b634 100644 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -1,11 +1,11 @@ -Route123_BerryMastersHouse_EventObjects: @ 853EACC +Route123_BerryMastersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 -Route123_BerryMastersHouse_MapWarps: @ 853EAFC +Route123_BerryMastersHouse_MapWarps: warp_def 3, 7, 0, 0, MAP_ROUTE123 warp_def 4, 7, 0, 0, MAP_ROUTE123 -Route123_BerryMastersHouse_MapEvents:: @ 853EB0C +Route123_BerryMastersHouse_MapEvents:: map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 163625aaed..158471eaab 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,10 +1,10 @@ -Route123_BerryMastersHouse: @ 8485CD4 +Route123_BerryMastersHouse: .4byte House2_Layout .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index ed10daab9c..959719385c 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,11 +1,11 @@ -Route124_MapConnectionsList: @ 8486B4C +Route124_MapConnectionsList: connection down, 0, MAP_ROUTE126 connection left, 10, MAP_LILYCOVE_CITY connection right, 0, MAP_ROUTE125 connection right, 40, MAP_MOSSDEEP_CITY connection dive, 0, MAP_UNDERWATER1 -Route124_MapConnections: @ 8486B88 - .4byte 0x5 +Route124_MapConnections: + .4byte 5 .4byte Route124_MapConnectionsList diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 4b52615fc7..4096396e89 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,4 +1,4 @@ -Route124_EventObjects: @ 852C3C4 +Route124_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 @@ -12,12 +12,12 @@ Route124_EventObjects: @ 852C3C4 object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 -Route124_MapWarps: @ 852C4E4 +Route124_MapWarps: warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE -Route124_MapBGEvents: @ 852C4EC +Route124_MapBGEvents: bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C -Route124_MapEvents:: @ 852C4F8 +Route124_MapEvents:: map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index c9ae442b7a..189d0dc516 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,10 +1,10 @@ -Route124: @ 84828FC +Route124: .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections .2byte MUS_DOORO_X3 - .2byte 40 + .2byte LAYOUT_ROUTE124 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index 30dffed32d..4cff6a1f3f 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -1,12 +1,13 @@ -Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C +Route124_DivingTreasureHuntersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 -Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 +Route124_DivingTreasureHuntersHouse_MapWarps: warp_def 3, 8, 0, 0, MAP_ROUTE124 warp_def 4, 8, 0, 0, MAP_ROUTE124 -Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 +Route124_DivingTreasureHuntersHouse_MapBGEvents: bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 +Route124_DivingTreasureHuntersHouse_MapEvents:: map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index db9097ce54..46358f3374 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,10 +1,10 @@ -Route124_DivingTreasureHuntersHouse: @ 8485D44 +Route124_DivingTreasureHuntersHouse: .4byte Route124_DivingTreasureHuntersHouse_Layout .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 301 + .2byte LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 2b5f944c9a..61ea9f0296 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,9 +1,9 @@ -Route125_MapConnectionsList: @ 8486B90 +Route125_MapConnectionsList: connection down, 0, MAP_MOSSDEEP_CITY connection left, 0, MAP_ROUTE124 connection dive, 0, MAP_UNDERWATER7 -Route125_MapConnections: @ 8486BB4 - .4byte 0x3 +Route125_MapConnections: + .4byte 3 .4byte Route125_MapConnectionsList diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index 256802406a..e278d6e241 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,4 +1,4 @@ -Route125_EventObjects: @ 852C50C +Route125_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 @@ -10,15 +10,15 @@ Route125_EventObjects: @ 852C50C object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL -Route125_MapWarps: @ 852C5FC +Route125_MapWarps: warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM -Route125_MapBGEvents: @ 852C604 +Route125_MapBGEvents: bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 -Route125_MapEvents:: @ 852C634 +Route125_MapEvents:: map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 12ea805319..b3a7308f31 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,10 +1,10 @@ -Route125: @ 8482918 +Route125: .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections .2byte MUS_DOORO_X3 - .2byte 41 + .2byte LAYOUT_ROUTE125 .byte MAPSEC_ROUTE_125 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index b1f0f6d819..5784faa258 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,9 +1,9 @@ -Route126_MapConnectionsList: @ 8486BBC +Route126_MapConnectionsList: connection up, 0, MAP_ROUTE124 connection right, 0, MAP_ROUTE127 connection dive, 0, MAP_UNDERWATER2 -Route126_MapConnections: @ 8486BE0 - .4byte 0x3 +Route126_MapConnections: + .4byte 3 .4byte Route126_MapConnectionsList diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index 8754a0006d..04355d668f 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -1,4 +1,4 @@ -Route126_EventObjects: @ 852C648 +Route126_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 @@ -9,6 +9,6 @@ Route126_EventObjects: @ 852C648 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 -Route126_MapEvents:: @ 852C720 +Route126_MapEvents:: map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 86225727fa..f0eabeeba4 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,10 +1,10 @@ -Route126: @ 8482934 +Route126: .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections .2byte MUS_DOORO_X3 - .2byte 42 + .2byte LAYOUT_ROUTE126 .byte MAPSEC_ROUTE_126 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 3ad7057a3e..8dcdf7978a 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,10 +1,10 @@ -Route127_MapConnectionsList: @ 8486BE8 +Route127_MapConnectionsList: connection up, 0, MAP_MOSSDEEP_CITY connection down, 0, MAP_ROUTE128 connection left, 0, MAP_ROUTE126 connection dive, 0, MAP_UNDERWATER3 -Route127_MapConnections: @ 8486C18 - .4byte 0x4 +Route127_MapConnections: + .4byte 4 .4byte Route127_MapConnectionsList diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 78dc268997..7b9e040d30 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,4 +1,4 @@ -Route127_EventObjects: @ 852C734 +Route127_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC @@ -11,13 +11,13 @@ Route127_EventObjects: @ 852C734 object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY -Route127_MapBGEvents: @ 852C83C +Route127_MapBGEvents: bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 -Route127_MapEvents:: @ 852C878 +Route127_MapEvents:: map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index b237a42ab1..0a7055f1c5 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,10 +1,10 @@ -Route127: @ 8482950 +Route127: .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections .2byte MUS_DOORO_X3 - .2byte 43 + .2byte LAYOUT_ROUTE127 .byte MAPSEC_ROUTE_127 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index 5b2f0665d4..b958dbd3b7 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,10 +1,10 @@ -Route128_MapConnectionsList: @ 8486C20 +Route128_MapConnectionsList: connection up, 0, MAP_ROUTE127 connection down, 0, MAP_ROUTE129 connection right, -40, MAP_EVER_GRANDE_CITY connection dive, 0, MAP_UNDERWATER4 -Route128_MapConnections: @ 8486C50 - .4byte 0x4 +Route128_MapConnections: + .4byte 4 .4byte Route128_MapConnectionsList diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index 792ff5ca32..6a449b7614 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,4 +1,4 @@ -Route128_EventObjects: @ 852C88C +Route128_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN @@ -10,11 +10,11 @@ Route128_EventObjects: @ 852C88C object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 -Route128_MapBGEvents: @ 852C97C +Route128_MapBGEvents: bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 -Route128_MapEvents:: @ 852C9A0 +Route128_MapEvents:: map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 2875033e97..33894ba7c1 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,10 +1,10 @@ -Route128: @ 848296C +Route128: .4byte Route128_Layout .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections .2byte MUS_DOORO_X3 - .2byte 44 + .2byte LAYOUT_ROUTE128 .byte MAPSEC_ROUTE_128 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index 1293e82353..c486c13cb0 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,9 +1,9 @@ -Route129_MapConnectionsList: @ 8486C58 +Route129_MapConnectionsList: connection up, 0, MAP_ROUTE128 connection left, 0, MAP_ROUTE130 connection dive, 0, MAP_UNDERWATER5 -Route129_MapConnections: @ 8486C7C - .4byte 0x3 +Route129_MapConnections: + .4byte 3 .4byte Route129_MapConnectionsList diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc index c127ec5e3b..3919274cd6 100644 --- a/data/maps/Route129/events.inc +++ b/data/maps/Route129/events.inc @@ -1,10 +1,10 @@ -Route129_EventObjects: @ 852C9B4 +Route129_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 -Route129_MapEvents:: @ 852CA2C +Route129_MapEvents:: map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 645cc7d92e..fd3cae8014 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,10 +1,10 @@ -Route129: @ 8482988 +Route129: .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections .2byte MUS_GRANROAD - .2byte 45 + .2byte LAYOUT_ROUTE129 .byte MAPSEC_ROUTE_129 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index b977d43bca..4300eaae4e 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,8 +1,8 @@ -Route130_MapConnectionsList: @ 8486C84 +Route130_MapConnectionsList: connection left, 0, MAP_ROUTE131 connection right, 0, MAP_ROUTE129 -Route130_MapConnections: @ 8486C9C - .4byte 0x2 +Route130_MapConnections: + .4byte 2 .4byte Route130_MapConnectionsList diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index 97532e5769..b07cc10017 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,9 +1,9 @@ -Route130_EventObjects: @ 852CA40 +Route130_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 -Route130_MapEvents:: @ 852CAA0 +Route130_MapEvents:: map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 4c03656acc..5afd25edaf 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,10 +1,10 @@ -Route130: @ 84829A4 +Route130: .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections .2byte MUS_GRANROAD - .2byte 263 + .2byte LAYOUT_ROUTE130 .byte MAPSEC_ROUTE_130 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index 150ea7023c..9697ba1e0d 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,8 +1,8 @@ -Route131_MapConnectionsList: @ 8486CA4 +Route131_MapConnectionsList: connection left, 0, MAP_PACIFIDLOG_TOWN connection right, 0, MAP_ROUTE130 -Route131_MapConnections: @ 8486CBC - .4byte 0x2 +Route131_MapConnections: + .4byte 2 .4byte Route131_MapConnectionsList diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc index 1c321a6cb3..4f57f7b1c6 100644 --- a/data/maps/Route131/events.inc +++ b/data/maps/Route131/events.inc @@ -1,4 +1,4 @@ -Route131_EventObjects: @ 852CAB4 +Route131_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 @@ -8,9 +8,9 @@ Route131_EventObjects: @ 852CAB4 object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 -Route131_MapWarps: @ 852CB74 +Route131_MapWarps: warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE -Route131_MapEvents:: @ 852CB7C +Route131_MapEvents:: map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index e84799fd4d..177dba5ab7 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,10 +1,10 @@ -Route131: @ 84829C0 +Route131: .4byte Route131_Layout .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections .2byte MUS_GRANROAD - .2byte 47 + .2byte LAYOUT_ROUTE131 .byte MAPSEC_ROUTE_131 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index 5a70e34717..48999eb5c9 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,8 +1,8 @@ -Route132_MapConnectionsList: @ 8486CC4 +Route132_MapConnectionsList: connection left, 0, MAP_ROUTE133 connection right, 0, MAP_PACIFIDLOG_TOWN -Route132_MapConnections: @ 8486CDC - .4byte 0x2 +Route132_MapConnections: + .4byte 2 .4byte Route132_MapConnectionsList diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index da648b9256..8ced112056 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,4 +1,4 @@ -Route132_EventObjects: @ 852CB90 +Route132_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY @@ -10,6 +10,6 @@ Route132_EventObjects: @ 852CB90 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN -Route132_MapEvents:: @ 852CC80 +Route132_MapEvents:: map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 50630af030..06e0ac05d1 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,10 +1,10 @@ -Route132: @ 84829DC +Route132: .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections .2byte MUS_GRANROAD - .2byte 48 + .2byte LAYOUT_ROUTE132 .byte MAPSEC_ROUTE_132 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index 1f22ea9605..6a7777c4b2 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,8 +1,8 @@ -Route133_MapConnectionsList: @ 8486CE4 +Route133_MapConnectionsList: connection left, 0, MAP_ROUTE134 connection right, 0, MAP_ROUTE132 -Route133_MapConnections: @ 8486CFC - .4byte 0x2 +Route133_MapConnections: + .4byte 2 .4byte Route133_MapConnectionsList diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index 36f8b747d3..641489016c 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,4 +1,4 @@ -Route133_EventObjects: @ 852CC94 +Route133_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 @@ -10,6 +10,6 @@ Route133_EventObjects: @ 852CC94 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE -Route133_MapEvents:: @ 852CD84 +Route133_MapEvents:: map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index ed6b7d2cea..2d4cc8a664 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,10 +1,10 @@ -Route133: @ 84829F8 +Route133: .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections .2byte MUS_GRANROAD - .2byte 49 + .2byte LAYOUT_ROUTE133 .byte MAPSEC_ROUTE_133 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index 861c82b4d1..30989b3741 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,8 +1,8 @@ -Route134_MapConnectionsList: @ 8486D04 +Route134_MapConnectionsList: connection left, 0, MAP_SLATEPORT_CITY connection right, 0, MAP_ROUTE133 -Route134_MapConnections: @ 8486D1C - .4byte 0x2 +Route134_MapConnections: + .4byte 2 .4byte Route134_MapConnectionsList diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 8caf4da1e8..83e693c267 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,4 +1,4 @@ -Route134_EventObjects: @ 852CD98 +Route134_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 @@ -11,6 +11,6 @@ Route134_EventObjects: @ 852CD98 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE -Route134_MapEvents:: @ 852CEA0 +Route134_MapEvents:: map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 8204e2815d..87bddf5c75 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,10 +1,10 @@ -Route134: @ 8482A14 +Route134: .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections .2byte MUS_GRANROAD - .2byte 50 + .2byte LAYOUT_ROUTE134 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index dbca1662d0..c2921111f3 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,9 +1,9 @@ -RustboroCity_MapConnectionsList: @ 8486758 +RustboroCity_MapConnectionsList: connection up, 0, MAP_ROUTE115 connection down, 0, MAP_ROUTE104 connection right, 0, MAP_ROUTE116 -RustboroCity_MapConnections: @ 848677C - .4byte 0x3 +RustboroCity_MapConnections: + .4byte 3 .4byte RustboroCity_MapConnectionsList diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index b2bcfa7cac..ecf816f7d4 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -1,4 +1,4 @@ -RustboroCity_EventObjects: @ 85267E0 +RustboroCity_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 @@ -16,7 +16,7 @@ RustboroCity_EventObjects: @ 85267E0 object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 -RustboroCity_MapWarps: @ 8526960 +RustboroCity_MapWarps: warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART @@ -30,7 +30,7 @@ RustboroCity_MapWarps: @ 8526960 warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 -RustboroCity_MapCoordEvents: @ 85269C0 +RustboroCity_MapCoordEvents: coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 @@ -53,7 +53,7 @@ RustboroCity_MapCoordEvents: @ 85269C0 coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 -RustboroCity_MapBGEvents: @ 8526B10 +RustboroCity_MapBGEvents: bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A @@ -65,6 +65,6 @@ RustboroCity_MapBGEvents: @ 8526B10 bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 -RustboroCity_MapEvents:: @ 8526B88 +RustboroCity_MapEvents:: map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 0cbd55b24d..f1f4a3d8ce 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,10 +1,10 @@ -RustboroCity: @ 848250C +RustboroCity: .4byte RustboroCity_Layout .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN - .2byte 4 + .2byte LAYOUT_RUSTBORO_CITY .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index 71e57a143e..4980d5b959 100644 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -1,11 +1,11 @@ -RustboroCity_CuttersHouse_EventObjects: @ 8530A1C +RustboroCity_CuttersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 -RustboroCity_CuttersHouse_MapWarps: @ 8530A4C +RustboroCity_CuttersHouse_MapWarps: warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY -RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C +RustboroCity_CuttersHouse_MapEvents:: map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 8ffdf2c7b6..434b27c3ef 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,10 +1,10 @@ -RustboroCity_CuttersHouse: @ 8483478 +RustboroCity_CuttersHouse: .4byte RustboroCity_CuttersHouse_Layout .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 98 + .2byte LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index f0d54df774..a3ed4affbd 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -1,17 +1,17 @@ -RustboroCity_DevonCorp_1F_EventObjects: @ 853037C +RustboroCity_DevonCorp_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 -RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 +RustboroCity_DevonCorp_1F_MapWarps: warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F -RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC +RustboroCity_DevonCorp_1F_MapBGEvents: bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312 bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309 -RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4 +RustboroCity_DevonCorp_1F_MapEvents:: map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index a6f55163bc..3515eacb5b 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_1F: @ 8483344 +RustboroCity_DevonCorp_1F: .4byte RustboroCity_DevonCorp_1F_Layout .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 92 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index f10c947805..fdf2e319ea 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 +RustboroCity_DevonCorp_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 @@ -6,10 +6,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 -RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 +RustboroCity_DevonCorp_2F_MapWarps: warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F -RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 +RustboroCity_DevonCorp_2F_MapEvents:: map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index bb548c44e5..dea4bb1b4b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_2F: @ 8483360 +RustboroCity_DevonCorp_2F: .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 93 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index df8ba02937..e9bae97463 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,15 +1,15 @@ -RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC +RustboroCity_DevonCorp_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 -RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 +RustboroCity_DevonCorp_3F_MapWarps: warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F -RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C +RustboroCity_DevonCorp_3F_MapBGEvents: bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 -RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524 +RustboroCity_DevonCorp_3F_MapEvents:: map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index d37f055a51..f64fe62539 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_3F: @ 848337C +RustboroCity_DevonCorp_3F: .4byte RustboroCity_DevonCorp_3F_Layout .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 269 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index b606a30dbc..7f745cbfd8 100644 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -1,12 +1,12 @@ -RustboroCity_Flat1_1F_EventObjects: @ 8530890 +RustboroCity_Flat1_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 -RustboroCity_Flat1_1F_MapWarps: @ 85308C0 +RustboroCity_Flat1_1F_MapWarps: warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F -RustboroCity_Flat1_1F_MapEvents:: @ 85308D8 +RustboroCity_Flat1_1F_MapEvents:: map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 9d3a63c8c6..ea268aed46 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat1_1F: @ 8483424 +RustboroCity_Flat1_1F: .4byte RustboroCity_Flat1_1F_Layout .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 313 + .2byte LAYOUT_RUSTBORO_CITY_FLAT1_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index 9d3aace61f..02c650f870 100644 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -1,4 +1,4 @@ -RustboroCity_Flat1_2F_EventObjects: @ 85308EC +RustboroCity_Flat1_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 @@ -8,9 +8,9 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 -RustboroCity_Flat1_2F_MapWarps: @ 85309AC +RustboroCity_Flat1_2F_MapWarps: warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F -RustboroCity_Flat1_2F_MapEvents:: @ 85309B4 +RustboroCity_Flat1_2F_MapEvents:: map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index ce47b6cb41..9f6d03649d 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat1_2F: @ 8483440 +RustboroCity_Flat1_2F: .4byte RustboroCity_Flat1_2F_Layout .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 314 + .2byte LAYOUT_RUSTBORO_CITY_FLAT1_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index c355742618..82105a66a4 100644 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -1,12 +1,12 @@ -RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 +RustboroCity_Flat2_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 -RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 +RustboroCity_Flat2_1F_MapWarps: warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F -RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C +RustboroCity_Flat2_1F_MapEvents:: map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index dc2a68edf5..73ae198856 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_1F: @ 84834B0 +RustboroCity_Flat2_1F: .4byte RustboroCity_Flat2_1F_Layout .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 294 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 60423b5d6a..fd8fad1a48 100644 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -1,11 +1,11 @@ -RustboroCity_Flat2_2F_EventObjects: @ 8530B20 +RustboroCity_Flat2_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 -RustboroCity_Flat2_2F_MapWarps: @ 8530B50 +RustboroCity_Flat2_2F_MapWarps: warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F -RustboroCity_Flat2_2F_MapEvents:: @ 8530B60 +RustboroCity_Flat2_2F_MapEvents:: map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 1d117d3166..d002b54ae5 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_2F: @ 84834CC +RustboroCity_Flat2_2F: .4byte RustboroCity_Flat2_2F_Layout .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 295 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index 9ab4727f3f..a33992eb26 100644 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F_EventObjects: @ 8530B74 +RustboroCity_Flat2_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 -RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 +RustboroCity_Flat2_3F_MapWarps: warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F -RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC +RustboroCity_Flat2_3F_MapEvents:: map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 037ca68211..1b7f52fcaf 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F: @ 84834E8 +RustboroCity_Flat2_3F: .4byte RustboroCity_Flat2_3F_Layout .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 296 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_3F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 0d1f57cdd4..3fb1517998 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,18 +1,18 @@ -RustboroCity_Gym_EventObjects: @ 8530538 +RustboroCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 -RustboroCity_Gym_MapWarps: @ 85305B0 +RustboroCity_Gym_MapWarps: warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY -RustboroCity_Gym_MapBGEvents: @ 85305C0 +RustboroCity_Gym_MapBGEvents: bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 -RustboroCity_Gym_MapEvents:: @ 85305D8 +RustboroCity_Gym_MapEvents:: map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 72dc7ee47e..4f043ed982 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Gym: @ 8483398 +RustboroCity_Gym: .4byte RustboroCity_Gym_Layout .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 94 + .2byte LAYOUT_RUSTBORO_CITY_GYM .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc index 2fc0284a92..4278568e6e 100644 --- a/data/maps/RustboroCity_House1/events.inc +++ b/data/maps/RustboroCity_House1/events.inc @@ -1,11 +1,11 @@ -RustboroCity_House1_EventObjects: @ 85309C8 +RustboroCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 -RustboroCity_House1_MapWarps: @ 85309F8 +RustboroCity_House1_MapWarps: warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY -RustboroCity_House1_MapEvents:: @ 8530A08 +RustboroCity_House1_MapEvents:: map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index cff9064e93..22c08344aa 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House1: @ 848345C +RustboroCity_House1: .4byte RustboroCity_House1_Layout .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 97 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE1 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc index 2f8d4b2bfc..87f324126c 100644 --- a/data/maps/RustboroCity_House2/events.inc +++ b/data/maps/RustboroCity_House2/events.inc @@ -1,11 +1,11 @@ -RustboroCity_House2_EventObjects: @ 8530A70 +RustboroCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 -RustboroCity_House2_MapWarps: @ 8530AA0 +RustboroCity_House2_MapWarps: warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY -RustboroCity_House2_MapEvents:: @ 8530AB0 +RustboroCity_House2_MapEvents:: map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index d842f2e794..564b2aecc8 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House2: @ 8483494 +RustboroCity_House2: .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 96 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc index 95198b27c2..3d32a9c731 100644 --- a/data/maps/RustboroCity_House3/events.inc +++ b/data/maps/RustboroCity_House3/events.inc @@ -1,12 +1,12 @@ -RustboroCity_House3_EventObjects: @ 8530BC0 +RustboroCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 -RustboroCity_House3_MapWarps: @ 8530C08 +RustboroCity_House3_MapWarps: warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY -RustboroCity_House3_MapEvents:: @ 8530C18 +RustboroCity_House3_MapEvents:: map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 7f057cf156..eea35721ca 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House3: @ 8483504 +RustboroCity_House3: .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 96 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc index 8d65c367d0..131ffe24b2 100644 --- a/data/maps/RustboroCity_Mart/events.inc +++ b/data/maps/RustboroCity_Mart/events.inc @@ -1,13 +1,13 @@ -RustboroCity_Mart_EventObjects: @ 853080C +RustboroCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 -RustboroCity_Mart_MapWarps: @ 853086C +RustboroCity_Mart_MapWarps: warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY -RustboroCity_Mart_MapEvents:: @ 853087C +RustboroCity_Mart_MapEvents:: map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index bb41aab1dd..f6dbd60a58 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Mart: @ 8483408 +RustboroCity_Mart: .4byte Mart_Layout .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index 597eace15a..50b18e8823 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 +RustboroCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 -RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 +RustboroCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F -RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C +RustboroCity_PokemonCenter_1F_MapEvents:: map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 4c5c500740..71f0d8b258 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonCenter_1F: @ 84833D0 +RustboroCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index 346a4de16e..a565f259b4 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 +RustboroCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 +RustboroCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 +RustboroCity_PokemonCenter_2F_MapEvents:: map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 8e70f4c809..2ee6bdfd15 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonCenter_2F: @ 84833EC +RustboroCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 0c6ca19dce..0d230b178b 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -1,4 +1,4 @@ -RustboroCity_PokemonSchool_EventObjects: @ 85305EC +RustboroCity_PokemonSchool_EventObjects: object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 @@ -7,17 +7,17 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT -RustboroCity_PokemonSchool_MapWarps: @ 8530694 +RustboroCity_PokemonSchool_MapWarps: warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY -RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 +RustboroCity_PokemonSchool_MapBGEvents: bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C -RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 +RustboroCity_PokemonSchool_MapEvents:: map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 9b14670424..e02d9c7110 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonSchool: @ 84833B4 +RustboroCity_PokemonSchool: .4byte RustboroCity_PokemonSchool_Layout .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 .2byte MUS_P_SCHOOL - .2byte 95 + .2byte LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 292bda57d3..ea48a4828a 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,4 +1,4 @@ -RusturfTunnel_EventObjects: @ 85341C4 +RusturfTunnel_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL @@ -10,18 +10,18 @@ RusturfTunnel_EventObjects: @ 85341C4 object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN -RusturfTunnel_MapWarps: @ 85342B4 +RusturfTunnel_MapWarps: warp_def 4, 10, 3, 0, MAP_ROUTE116 warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN warp_def 18, 20, 3, 2, MAP_ROUTE116 -RusturfTunnel_MapCoordEvents: @ 85342CC +RusturfTunnel_MapCoordEvents: coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D -RusturfTunnel_MapEvents:: @ 853431C +RusturfTunnel_MapEvents:: map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 70a4776816..8bb9fa94fa 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,10 +1,10 @@ -RusturfTunnel: @ 8483F30 +RusturfTunnel: .4byte RusturfTunnel_Layout .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 129 + .2byte LAYOUT_RUSTURF_TUNNEL .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index c36e38fda7..56a07b43e4 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,11 +1,11 @@ -SSTidalCorridor_EventObjects: @ 853A158 +SSTidalCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT -SSTidalCorridor_MapWarps: @ 853A1D0 +SSTidalCorridor_MapWarps: warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS @@ -16,7 +16,7 @@ SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK -SSTidalCorridor_MapBGEvents: @ 853A218 +SSTidalCorridor_MapBGEvents: bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D @@ -30,6 +30,6 @@ SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 -SSTidalCorridor_MapEvents:: @ 853A2A8 +SSTidalCorridor_MapEvents:: map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 37128821c2..972fae2154 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,10 +1,10 @@ -SSTidalCorridor: @ 8484F0C +SSTidalCorridor: .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 277 + .2byte LAYOUT_SS_TIDAL_CORRIDOR .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 65ced7c13c..73385dfc3a 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -1,13 +1,13 @@ -SSTidalLowerDeck_EventObjects: @ 853A2BC +SSTidalLowerDeck_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 -SSTidalLowerDeck_MapWarps: @ 853A2EC +SSTidalLowerDeck_MapWarps: warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR -SSTidalLowerDeck_MapBGEvents: @ 853A2F4 +SSTidalLowerDeck_MapBGEvents: bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS -SSTidalLowerDeck_MapEvents:: @ 853A300 +SSTidalLowerDeck_MapEvents:: map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index f86d3ac06c..c14cf55130 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,10 +1,10 @@ -SSTidalLowerDeck: @ 8484F28 +SSTidalLowerDeck: .4byte SSTidalLowerDeck_Layout .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 278 + .2byte LAYOUT_SS_TIDAL_LOWER_DECK .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index 99937ef75a..dc8a57164b 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -1,4 +1,4 @@ -SSTidalRooms_EventObjects: @ 853A314 +SSTidalRooms_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 @@ -8,7 +8,7 @@ SSTidalRooms_EventObjects: @ 853A314 object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER -SSTidalRooms_MapWarps: @ 853A3D4 +SSTidalRooms_MapWarps: warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR @@ -22,10 +22,10 @@ SSTidalRooms_MapWarps: @ 853A3D4 warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR -SSTidalRooms_MapBGEvents: @ 853A434 +SSTidalRooms_MapBGEvents: bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 -SSTidalRooms_MapEvents:: @ 853A44C +SSTidalRooms_MapEvents:: map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 0d1f4db63f..951cd6ce13 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,10 +1,10 @@ -SSTidalRooms: @ 8484F44 +SSTidalRooms: .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 279 + .2byte LAYOUT_SS_TIDAL_ROOMS .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc index d99826f0d3..131338df92 100644 --- a/data/maps/SafariZone_North/connections.inc +++ b/data/maps/SafariZone_North/connections.inc @@ -1,9 +1,9 @@ -SafariZone_North_MapConnectionsList: @ 8486E18 +SafariZone_North_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_NORTHWEST connection down, 0, MAP_SAFARI_ZONE_SOUTH connection right, 0, MAP_SAFARI_ZONE_NORTHEAST -SafariZone_North_MapConnections: @ 8486E3C - .4byte 0x3 +SafariZone_North_MapConnections: + .4byte 3 .4byte SafariZone_North_MapConnectionsList diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc index 152fa54c5a..1131cd7146 100644 --- a/data/maps/SafariZone_North/events.inc +++ b/data/maps/SafariZone_North/events.inc @@ -1,4 +1,4 @@ -SafariZone_North_EventObjects: @ 853B160 +SafariZone_North_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11 @@ -9,6 +9,6 @@ SafariZone_North_EventObjects: @ 853B160 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM -SafariZone_North_MapEvents:: @ 853B238 +SafariZone_North_MapEvents:: map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index ebcb62f9a3..935a2c5a6e 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,10 +1,10 @@ -SafariZone_North: @ 8485158 +SafariZone_North: .4byte SafariZone_North_Layout .4byte SafariZone_North_MapEvents .4byte SafariZone_North_MapScripts .4byte SafariZone_North_MapConnections .2byte MUS_SAFARI - .2byte 239 + .2byte LAYOUT_SAFARI_ZONE_NORTH .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index c762c485ae..20595bd7af 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Northeast_MapConnectionsList: @ 8486E90 +SafariZone_Northeast_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_NORTH connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST -SafariZone_Northeast_MapConnections: @ 8486EA8 - .4byte 0x2 +SafariZone_Northeast_MapConnections: + .4byte 2 .4byte SafariZone_Northeast_MapConnectionsList diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index dc0393b4d7..02bb2fc19b 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,4 +1,4 @@ -SafariZone_Northeast_EventObjects: @ 853B968 +SafariZone_Northeast_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15 @@ -9,10 +9,10 @@ SafariZone_Northeast_EventObjects: @ 853B968 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET -SafariZone_Northeast_MapBGEvents: @ 853BA40 +SafariZone_Northeast_MapBGEvents: bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC -SafariZone_Northeast_MapEvents:: @ 853BA58 +SafariZone_Northeast_MapEvents:: map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 9db5fd596f..8c68cd8c29 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,10 +1,10 @@ -SafariZone_Northeast: @ 848528C +SafariZone_Northeast: .4byte SafariZone_Northeast_Layout .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI - .2byte 394 + .2byte LAYOUT_SAFARI_ZONE_NORTHEAST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index 010a13cc23..24ac78021e 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Northwest_MapConnectionsList: @ 8486DF8 +SafariZone_Northwest_MapConnectionsList: connection right, 0, MAP_SAFARI_ZONE_NORTH connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST -SafariZone_Northwest_MapConnections: @ 8486E10 - .4byte 0x2 +SafariZone_Northwest_MapConnections: + .4byte 2 .4byte SafariZone_Northwest_MapConnectionsList diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index 95b6623acf..729e51734e 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,7 +1,7 @@ -SafariZone_Northwest_EventObjects: @ 853B11C +SafariZone_Northwest_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 -SafariZone_Northwest_MapEvents:: @ 853B14C +SafariZone_Northwest_MapEvents:: map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index ca59f45e79..1218a65139 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,10 +1,10 @@ -SafariZone_Northwest: @ 848513C +SafariZone_Northwest: .4byte SafariZone_Northwest_Layout .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI - .2byte 238 + .2byte LAYOUT_SAFARI_ZONE_NORTHWEST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc index 5a54de9611..2d601b883a 100644 --- a/data/maps/SafariZone_RestHouse/events.inc +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -1,12 +1,12 @@ -SafariZone_RestHouse_EventObjects: @ 853B8FC +SafariZone_RestHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 -SafariZone_RestHouse_MapWarps: @ 853B944 +SafariZone_RestHouse_MapWarps: warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST -SafariZone_RestHouse_MapEvents:: @ 853B954 +SafariZone_RestHouse_MapEvents:: map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index fbb6f4d058..79d807c7fd 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,10 +1,10 @@ -SafariZone_RestHouse: @ 8485270 +SafariZone_RestHouse: .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 .2byte MUS_SAFARI - .2byte 329 + .2byte LAYOUT_SAFARI_ZONE_REST_HOUSE .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc index 856bb30aba..4c2e912ca4 100644 --- a/data/maps/SafariZone_South/connections.inc +++ b/data/maps/SafariZone_South/connections.inc @@ -1,9 +1,9 @@ -SafariZone_South_MapConnectionsList: @ 8486E64 +SafariZone_South_MapConnectionsList: connection up, 0, MAP_SAFARI_ZONE_NORTH connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST -SafariZone_South_MapConnections: @ 8486E88 - .4byte 0x3 +SafariZone_South_MapConnections: + .4byte 3 .4byte SafariZone_South_MapConnectionsList diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc index 6d8d84877f..8bc56885fe 100644 --- a/data/maps/SafariZone_South/events.inc +++ b/data/maps/SafariZone_South/events.inc @@ -1,4 +1,4 @@ -SafariZone_South_EventObjects: @ 853B2A4 +SafariZone_South_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 @@ -6,9 +6,9 @@ SafariZone_South_EventObjects: @ 853B2A4 object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS -SafariZone_South_MapWarps: @ 853B334 +SafariZone_South_MapWarps: warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE -SafariZone_South_MapEvents:: @ 853B33C +SafariZone_South_MapEvents:: map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 1567935d26..01fcac57f4 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -1,10 +1,10 @@ -SafariZone_South: @ 8485190 +SafariZone_South: .4byte SafariZone_South_Layout .4byte SafariZone_South_MapEvents .4byte SafariZone_South_MapScripts .4byte SafariZone_South_MapConnections .2byte MUS_SAFARI - .2byte 241 + .2byte LAYOUT_SAFARI_ZONE_SOUTH .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index 16b39e87b7..5a7b4140a2 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Southeast_MapConnectionsList: @ 8486EB0 +SafariZone_Southeast_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_SOUTH connection up, 0, MAP_SAFARI_ZONE_NORTHEAST -SafariZone_Southeast_MapConnections: @ 8486EC8 - .4byte 0x2 +SafariZone_Southeast_MapConnections: + .4byte 2 .4byte SafariZone_Southeast_MapConnectionsList diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index badaaefd4a..a35a8564d7 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -1,14 +1,14 @@ -SafariZone_Southeast_EventObjects: @ 853BA6C +SafariZone_Southeast_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION -SafariZone_Southeast_MapBGEvents: @ 853BAE4 +SafariZone_Southeast_MapBGEvents: bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE -SafariZone_Southeast_MapEvents:: @ 853BAFC +SafariZone_Southeast_MapEvents:: map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 55ff682323..b07747fd5c 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,10 +1,10 @@ -SafariZone_Southeast: @ 84852A8 +SafariZone_Southeast: .4byte SafariZone_Southeast_Layout .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI - .2byte 395 + .2byte LAYOUT_SAFARI_ZONE_SOUTHEAST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index 83398e3a3d..34702a3c29 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Southwest_MapConnectionsList: @ 8486E44 +SafariZone_Southwest_MapConnectionsList: connection up, 0, MAP_SAFARI_ZONE_NORTHWEST connection right, 0, MAP_SAFARI_ZONE_SOUTH -SafariZone_Southwest_MapConnections: @ 8486E5C - .4byte 0x2 +SafariZone_Southwest_MapConnections: + .4byte 2 .4byte SafariZone_Southwest_MapConnectionsList diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 930d3c8ed5..6a6a488879 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,13 +1,13 @@ -SafariZone_Southwest_EventObjects: @ 853B24C +SafariZone_Southwest_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE -SafariZone_Southwest_MapWarps: @ 853B27C +SafariZone_Southwest_MapWarps: warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE -SafariZone_Southwest_MapBGEvents: @ 853B284 +SafariZone_Southwest_MapBGEvents: bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 -SafariZone_Southwest_MapEvents:: @ 853B290 +SafariZone_Southwest_MapEvents:: map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 189fa09b87..f3cafdebb7 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,10 +1,10 @@ -SafariZone_Southwest: @ 8485174 +SafariZone_Southwest: .4byte SafariZone_Southwest_Layout .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI - .2byte 240 + .2byte LAYOUT_SAFARI_ZONE_SOUTHWEST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index 20a5fc145e..f43240a781 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,9 +1,9 @@ -ScorchedSlab_EventObjects: @ 8536F88 +ScorchedSlab_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11 -ScorchedSlab_MapWarps: @ 8536FA0 +ScorchedSlab_MapWarps: warp_def 7, 16, 1, 1, MAP_ROUTE120 -ScorchedSlab_MapEvents:: @ 8536FA8 +ScorchedSlab_MapEvents:: map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 84c09df3fa..ec09efb0fc 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,10 +1,10 @@ -ScorchedSlab: @ 84846BC +ScorchedSlab: .4byte ScorchedSlab_Layout .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 311 + .2byte LAYOUT_SCORCHED_SLAB .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc index b0574d14ec..ea20574178 100644 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance_EventObjects: @ 85356BC +SeafloorCavern_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT -SeafloorCavern_Entrance_MapWarps: @ 85356D4 +SeafloorCavern_Entrance_MapWarps: warp_def 10, 18, 3, 0, MAP_UNDERWATER4 warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 -SeafloorCavern_Entrance_MapEvents:: @ 85356E4 +SeafloorCavern_Entrance_MapEvents:: map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 8e62470ac1..b1b8ec30c9 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance: @ 84841B4 +SeafloorCavern_Entrance: .4byte SeafloorCavern_Entrance_Layout .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 147 + .2byte LAYOUT_SEAFLOOR_CAVERN_ENTRANCE .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index 2c507151b1..a5cb5ed3b1 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,15 +1,15 @@ -SeafloorCavern_Room1_EventObjects: @ 85356F8 +SeafloorCavern_Room1_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13 object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room1_MapWarps: @ 8535770 +SeafloorCavern_Room1_MapWarps: warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 -SeafloorCavern_Room1_MapEvents:: @ 8535788 +SeafloorCavern_Room1_MapEvents:: map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 9b84e5d960..14ab5fbdeb 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room1: @ 84841D0 +SeafloorCavern_Room1: .4byte SeafloorCavern_Room1_Layout .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 148 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM1 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index 1cc30957af..5e1af80276 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room2_EventObjects: @ 853579C +SeafloorCavern_Room2_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11 @@ -8,12 +8,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19 object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17 -SeafloorCavern_Room2_MapWarps: @ 853585C +SeafloorCavern_Room2_MapWarps: warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 -SeafloorCavern_Room2_MapEvents:: @ 853587C +SeafloorCavern_Room2_MapEvents:: map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index b7d4e47d78..822c7f2b10 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room2: @ 84841EC +SeafloorCavern_Room2: .4byte SeafloorCavern_Room2_Layout .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 149 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM2 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index e48782693e..168e9e96db 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room3_EventObjects: @ 8535890 +SeafloorCavern_Room3_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15 @@ -9,11 +9,11 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room3_MapWarps: @ 8535968 +SeafloorCavern_Room3_MapWarps: warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 -SeafloorCavern_Room3_MapEvents:: @ 8535980 +SeafloorCavern_Room3_MapEvents:: map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index b5a032b603..f1cfa25681 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room3: @ 8484208 +SeafloorCavern_Room3: .4byte SeafloorCavern_Room3_Layout .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 150 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM3 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index c4e96aee07..37f0c7b04c 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,13 +1,13 @@ -SeafloorCavern_Room4_EventObjects: @ 8535994 +SeafloorCavern_Room4_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room4_MapWarps: @ 85359C4 +SeafloorCavern_Room4_MapWarps: warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE -SeafloorCavern_Room4_MapEvents:: @ 85359E4 +SeafloorCavern_Room4_MapEvents:: map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 75b51c3436..22e6d27c75 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room4: @ 8484224 +SeafloorCavern_Room4: .4byte SeafloorCavern_Room4_Layout .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 151 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM4 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index e4780db227..4f75732700 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room5_EventObjects: @ 85359F8 +SeafloorCavern_Room5_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13 @@ -6,11 +6,11 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14 -SeafloorCavern_Room5_MapWarps: @ 8535A88 +SeafloorCavern_Room5_MapWarps: warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 -SeafloorCavern_Room5_MapEvents:: @ 8535AA0 +SeafloorCavern_Room5_MapEvents:: map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 6b053fc71c..42489c1dea 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room5: @ 8484240 +SeafloorCavern_Room5: .4byte SeafloorCavern_Room5_Layout .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 152 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM5 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc index 99c10d87eb..596daefe2f 100644 --- a/data/maps/SeafloorCavern_Room6/events.inc +++ b/data/maps/SeafloorCavern_Room6/events.inc @@ -1,8 +1,8 @@ -SeafloorCavern_Room6_MapWarps: @ 8535AB4 +SeafloorCavern_Room6_MapWarps: warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE -SeafloorCavern_Room6_MapEvents:: @ 8535ACC +SeafloorCavern_Room6_MapEvents:: map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index d1346acd86..f70a2d07e4 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room6: @ 848425C +SeafloorCavern_Room6: .4byte SeafloorCavern_Room6_Layout .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 153 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM6 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc index 2d8fca9995..fb3fcc1b6c 100644 --- a/data/maps/SeafloorCavern_Room7/events.inc +++ b/data/maps/SeafloorCavern_Room7/events.inc @@ -1,7 +1,7 @@ -SeafloorCavern_Room7_MapWarps: @ 8535AE0 +SeafloorCavern_Room7_MapWarps: warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 -SeafloorCavern_Room7_MapEvents:: @ 8535AF0 +SeafloorCavern_Room7_MapEvents:: map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index b5b4aca03b..28433a0519 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room7: @ 8484278 +SeafloorCavern_Room7: .4byte SeafloorCavern_Room7_Layout .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 154 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM7 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index c34ec76d31..673f303fe7 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room8_EventObjects: @ 8535B04 +SeafloorCavern_Room8_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13 @@ -12,10 +12,10 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C -SeafloorCavern_Room8_MapWarps: @ 8535C24 +SeafloorCavern_Room8_MapWarps: warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 -SeafloorCavern_Room8_MapEvents:: @ 8535C34 +SeafloorCavern_Room8_MapEvents:: map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 0ada4ab71a..bc6f7de4b6 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room8: @ 8484294 +SeafloorCavern_Room8: .4byte SeafloorCavern_Room8_Layout .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 155 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM8 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 6ca415e129..771f58b150 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room9_EventObjects: @ 8535C48 +SeafloorCavern_Room9_EventObjects: object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE @@ -7,12 +7,12 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 -SeafloorCavern_Room9_MapWarps: @ 8535CF0 +SeafloorCavern_Room9_MapWarps: warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 -SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 +SeafloorCavern_Room9_MapCoordEvents: coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 -SeafloorCavern_Room9_MapEvents:: @ 8535D08 +SeafloorCavern_Room9_MapEvents:: map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 4d2be9474a..5748571be5 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room9: @ 84842B0 +SeafloorCavern_Room9: .4byte SeafloorCavern_Room9_Layout .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 156 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM9 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index ddd6c15ec9..96891324d0 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -1,7 +1,7 @@ -SealedChamber_InnerRoom_MapWarps: @ 8536F00 +SealedChamber_InnerRoom_MapWarps: warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM -SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 +SealedChamber_InnerRoom_MapBGEvents: bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255 bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F @@ -12,6 +12,6 @@ SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 -SealedChamber_InnerRoom_MapEvents:: @ 8536F74 +SealedChamber_InnerRoom_MapEvents:: map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 5fa5dccc9c..6e2a2ff8b8 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,10 +1,10 @@ -SealedChamber_InnerRoom: @ 84846A0 +SealedChamber_InnerRoom: .4byte SealedChamber_InnerRoom_Layout .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 304 + .2byte LAYOUT_SEALED_CHAMBER_INNER_ROOM .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 3cd1b97143..530ff738c8 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -1,7 +1,7 @@ -SealedChamber_OuterRoom_MapWarps: @ 8536D88 +SealedChamber_OuterRoom_MapWarps: warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM -SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 +SealedChamber_OuterRoom_MapBGEvents: bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 @@ -32,6 +32,6 @@ SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED -SealedChamber_OuterRoom_MapEvents:: @ 8536EEC +SealedChamber_OuterRoom_MapEvents:: map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 3930e818dd..bdb40d153a 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,10 +1,10 @@ -SealedChamber_OuterRoom: @ 8484684 +SealedChamber_OuterRoom: .4byte SealedChamber_OuterRoom_Layout .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 284 + .2byte LAYOUT_SEALED_CHAMBER_OUTER_ROOM .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 95e52b889f..f0cfb017f7 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave1_EventObjects: @ 8537BEC +SecretBase_BlueCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave1_MapWarps: @ 8537D54 +SecretBase_BlueCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_BlueCave1_MapEvents:: @ 8537D5C +SecretBase_BlueCave1_MapEvents:: map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 60eeeab322..5159eec532 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave1: @ 8484AC8 +SecretBase_BlueCave1: .4byte SecretBase_BlueCave1_Layout .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 199 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 62c4b8dcda..9a2a82db6f 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave2_EventObjects: @ 8538504 +SecretBase_BlueCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave2_MapWarps: @ 853866C +SecretBase_BlueCave2_MapWarps: warp_def 7, 5, 0, 126, MAP_NONE -SecretBase_BlueCave2_MapEvents:: @ 8538674 +SecretBase_BlueCave2_MapEvents:: map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 348a5cd021..4d893835b5 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave2: @ 8484B70 +SecretBase_BlueCave2: .4byte SecretBase_BlueCave2_Layout .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 205 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index 14c7460adf..463c513e58 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave3_EventObjects: @ 8538E1C +SecretBase_BlueCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave3_MapWarps: @ 8538F84 +SecretBase_BlueCave3_MapWarps: warp_def 4, 15, 0, 126, MAP_NONE -SecretBase_BlueCave3_MapEvents:: @ 8538F8C +SecretBase_BlueCave3_MapEvents:: map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 26ab5ef93a..1e730552ed 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave3: @ 8484C18 +SecretBase_BlueCave3: .4byte SecretBase_BlueCave3_Layout .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 211 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index 1d047cd42f..fd121b5948 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave4_EventObjects: @ 8539734 +SecretBase_BlueCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave4_MapWarps: @ 853989C +SecretBase_BlueCave4_MapWarps: warp_def 4, 15, 0, 126, MAP_NONE -SecretBase_BlueCave4_MapEvents:: @ 85398A4 +SecretBase_BlueCave4_MapEvents:: map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 5e253d51e8..ff6cb64dc2 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave4: @ 8484CC0 +SecretBase_BlueCave4: .4byte SecretBase_BlueCave4_Layout .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 217 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index 43d1445351..82e5232985 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave1_EventObjects: @ 8537A68 +SecretBase_BrownCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave1_MapWarps: @ 8537BD0 +SecretBase_BrownCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_BrownCave1_MapEvents:: @ 8537BD8 +SecretBase_BrownCave1_MapEvents:: map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index ab531bf5cb..e20bdbce1f 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave1: @ 8484AAC +SecretBase_BrownCave1: .4byte SecretBase_BrownCave1_Layout .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 198 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index 09bb033277..86d18b5d9e 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave2_EventObjects: @ 8538380 +SecretBase_BrownCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave2_MapWarps: @ 85384E8 +SecretBase_BrownCave2_MapWarps: warp_def 1, 7, 0, 126, MAP_NONE -SecretBase_BrownCave2_MapEvents:: @ 85384F0 +SecretBase_BrownCave2_MapEvents:: map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 464bcd059a..93f2b59237 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave2: @ 8484B54 +SecretBase_BrownCave2: .4byte SecretBase_BrownCave2_Layout .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 204 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index 12ec865878..2ec6ed1b25 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave3_EventObjects: @ 8538C98 +SecretBase_BrownCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave3_MapWarps: @ 8538E00 +SecretBase_BrownCave3_MapWarps: warp_def 11, 9, 0, 126, MAP_NONE -SecretBase_BrownCave3_MapEvents:: @ 8538E08 +SecretBase_BrownCave3_MapEvents:: map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 923b2c4be8..5c4fac1c0a 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave3: @ 8484BFC +SecretBase_BrownCave3: .4byte SecretBase_BrownCave3_Layout .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 210 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 15fab00be7..58e71dc186 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave4_EventObjects: @ 85395B0 +SecretBase_BrownCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave4_MapWarps: @ 8539718 +SecretBase_BrownCave4_MapWarps: warp_def 2, 8, 0, 126, MAP_NONE -SecretBase_BrownCave4_MapEvents:: @ 8539720 +SecretBase_BrownCave4_MapEvents:: map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 6d61f06a72..b3123ee222 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave4: @ 8484CA4 +SecretBase_BrownCave4: .4byte SecretBase_BrownCave4_Layout .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 216 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index e0d7180681..015e2bde58 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave1_EventObjects: @ 85378E4 +SecretBase_RedCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave1_MapWarps: @ 8537A4C +SecretBase_RedCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_RedCave1_MapEvents:: @ 8537A54 +SecretBase_RedCave1_MapEvents:: map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 82fc8c4e30..4ac30b1cb8 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave1: @ 8484A90 +SecretBase_RedCave1: .4byte SecretBase_RedCave1_Layout .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 197 + .2byte LAYOUT_SECRET_BASE_RED_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index 365e3f353d..70997288dc 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave2_EventObjects: @ 85381FC +SecretBase_RedCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave2_EventObjects: @ 85381FC object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave2_MapWarps: @ 8538364 +SecretBase_RedCave2_MapWarps: warp_def 3, 14, 0, 126, MAP_NONE -SecretBase_RedCave2_MapEvents:: @ 853836C +SecretBase_RedCave2_MapEvents:: map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index e4a2176d71..64ef711962 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave2: @ 8484B38 +SecretBase_RedCave2: .4byte SecretBase_RedCave2_Layout .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 203 + .2byte LAYOUT_SECRET_BASE_RED_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index 16e14d49fd..191aed927b 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave3_EventObjects: @ 8538B14 +SecretBase_RedCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave3_MapWarps: @ 8538C7C +SecretBase_RedCave3_MapWarps: warp_def 3, 6, 0, 126, MAP_NONE -SecretBase_RedCave3_MapEvents:: @ 8538C84 +SecretBase_RedCave3_MapEvents:: map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 9317921e20..880fa84e60 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave3: @ 8484BE0 +SecretBase_RedCave3: .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 209 + .2byte LAYOUT_SECRET_BASE_RED_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index eaf2275067..9e29c6bcc0 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave4_EventObjects: @ 853942C +SecretBase_RedCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave4_EventObjects: @ 853942C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave4_MapWarps: @ 8539594 +SecretBase_RedCave4_MapWarps: warp_def 2, 12, 0, 126, MAP_NONE -SecretBase_RedCave4_MapEvents:: @ 853959C +SecretBase_RedCave4_MapEvents:: map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 62fd094a45..7454f02511 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave4: @ 8484C88 +SecretBase_RedCave4: .4byte SecretBase_RedCave4_Layout .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 215 + .2byte LAYOUT_SECRET_BASE_RED_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index 07eb2e1bd0..89c8329692 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub1_EventObjects: @ 8538078 +SecretBase_Shrub1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub1_EventObjects: @ 8538078 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub1_MapWarps: @ 85381E0 +SecretBase_Shrub1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_Shrub1_MapEvents:: @ 85381E8 +SecretBase_Shrub1_MapEvents:: map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 4807cc4852..76bfd45069 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub1: @ 8484B1C +SecretBase_Shrub1: .4byte SecretBase_Shrub1_Layout .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 202 + .2byte LAYOUT_SECRET_BASE_SHRUB1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index 385500c5fd..6e1f4ee8c3 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub2_EventObjects: @ 8538990 +SecretBase_Shrub2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub2_EventObjects: @ 8538990 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub2_MapWarps: @ 8538AF8 +SecretBase_Shrub2_MapWarps: warp_def 7, 5, 0, 126, MAP_NONE -SecretBase_Shrub2_MapEvents:: @ 8538B00 +SecretBase_Shrub2_MapEvents:: map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 56df5fd2f2..53faf2d72d 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub2: @ 8484BC4 +SecretBase_Shrub2: .4byte SecretBase_Shrub2_Layout .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 208 + .2byte LAYOUT_SECRET_BASE_SHRUB2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index 8cc399fed5..38408df635 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub3_EventObjects: @ 85392A8 +SecretBase_Shrub3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub3_MapWarps: @ 8539410 +SecretBase_Shrub3_MapWarps: warp_def 6, 9, 0, 126, MAP_NONE -SecretBase_Shrub3_MapEvents:: @ 8539418 +SecretBase_Shrub3_MapEvents:: map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 3b5ade8f3b..4692a00608 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub3: @ 8484C6C +SecretBase_Shrub3: .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 214 + .2byte LAYOUT_SECRET_BASE_SHRUB3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index 16dfd4ba12..1ebe8a0e82 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub4_EventObjects: @ 8539BC0 +SecretBase_Shrub4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub4_MapWarps: @ 8539D28 +SecretBase_Shrub4_MapWarps: warp_def 11, 8, 0, 126, MAP_NONE -SecretBase_Shrub4_MapEvents:: @ 8539D30 +SecretBase_Shrub4_MapEvents:: map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 816b963cb5..2b0186878a 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub4: @ 8484D14 +SecretBase_Shrub4: .4byte SecretBase_Shrub4_Layout .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 220 + .2byte LAYOUT_SECRET_BASE_SHRUB4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 8c7c05e6ea..6ed26cb27b 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree1_EventObjects: @ 8537EF4 +SecretBase_Tree1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree1_MapWarps: @ 853805C +SecretBase_Tree1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_Tree1_MapEvents:: @ 8538064 +SecretBase_Tree1_MapEvents:: map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index f1ed545a5a..8cace4cef6 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree1: @ 8484B00 +SecretBase_Tree1: .4byte SecretBase_Tree1_Layout .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 201 + .2byte LAYOUT_SECRET_BASE_TREE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index e6b5c627b6..46b268c372 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree2_EventObjects: @ 853880C +SecretBase_Tree2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree2_EventObjects: @ 853880C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree2_MapWarps: @ 8538974 +SecretBase_Tree2_MapWarps: warp_def 3, 14, 0, 126, MAP_NONE -SecretBase_Tree2_MapEvents:: @ 853897C +SecretBase_Tree2_MapEvents:: map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 2d8c2652cf..7f286a94f5 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree2: @ 8484BA8 +SecretBase_Tree2: .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 207 + .2byte LAYOUT_SECRET_BASE_TREE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index 921c4f1022..8512b4e317 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree3_EventObjects: @ 8539124 +SecretBase_Tree3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree3_EventObjects: @ 8539124 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree3_MapWarps: @ 853928C +SecretBase_Tree3_MapWarps: warp_def 8, 6, 0, 126, MAP_NONE -SecretBase_Tree3_MapEvents:: @ 8539294 +SecretBase_Tree3_MapEvents:: map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index e4f703d211..6794908751 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree3: @ 8484C50 +SecretBase_Tree3: .4byte SecretBase_Tree3_Layout .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 213 + .2byte LAYOUT_SECRET_BASE_TREE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index ee2495e790..ed0f8b2360 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree4_EventObjects: @ 8539A3C +SecretBase_Tree4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree4_EventObjects: @ 8539A3C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree4_MapWarps: @ 8539BA4 +SecretBase_Tree4_MapWarps: warp_def 7, 12, 0, 126, MAP_NONE -SecretBase_Tree4_MapEvents:: @ 8539BAC +SecretBase_Tree4_MapEvents:: map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 7cf8ef0249..ff2605f406 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree4: @ 8484CF8 +SecretBase_Tree4: .4byte SecretBase_Tree4_Layout .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 219 + .2byte LAYOUT_SECRET_BASE_TREE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index 6beae3454e..6464c48543 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave1_EventObjects: @ 8537D70 +SecretBase_YellowCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave1_MapWarps: @ 8537ED8 +SecretBase_YellowCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_YellowCave1_MapEvents:: @ 8537EE0 +SecretBase_YellowCave1_MapEvents:: map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 9bc1b071eb..642db55f51 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave1: @ 8484AE4 +SecretBase_YellowCave1: .4byte SecretBase_YellowCave1_Layout .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 200 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index 9378718c4a..99bcee17dc 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave2_EventObjects: @ 8538688 +SecretBase_YellowCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave2_MapWarps: @ 85387F0 +SecretBase_YellowCave2_MapWarps: warp_def 12, 7, 0, 126, MAP_NONE -SecretBase_YellowCave2_MapEvents:: @ 85387F8 +SecretBase_YellowCave2_MapEvents:: map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 60c0f49f0f..ae0cd73bc4 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave2: @ 8484B8C +SecretBase_YellowCave2: .4byte SecretBase_YellowCave2_Layout .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 206 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 3a60b042b5..10bbfac8da 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave3_EventObjects: @ 8538FA0 +SecretBase_YellowCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave3_MapWarps: @ 8539108 +SecretBase_YellowCave3_MapWarps: warp_def 5, 9, 0, 126, MAP_NONE -SecretBase_YellowCave3_MapEvents:: @ 8539110 +SecretBase_YellowCave3_MapEvents:: map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index b82555cf42..39008b2b30 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave3: @ 8484C34 +SecretBase_YellowCave3: .4byte SecretBase_YellowCave3_Layout .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 212 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index 13757dbef6..9afc932970 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave4_EventObjects: @ 85398B8 +SecretBase_YellowCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave4_MapWarps: @ 8539A20 +SecretBase_YellowCave4_MapWarps: warp_def 6, 12, 0, 126, MAP_NONE -SecretBase_YellowCave4_MapEvents:: @ 8539A28 +SecretBase_YellowCave4_MapEvents:: map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index d7056f380c..24e10379b9 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave4: @ 8484CDC +SecretBase_YellowCave4: .4byte SecretBase_YellowCave4_Layout .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 218 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc index e04abe6938..8fa935974c 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc @@ -1,3 +1,3 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: @ 853644C +ShoalCave_HighTideEntranceRoom_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index c4d7d39e9f..12d853e7a9 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_HighTideEntranceRoom: @ 8484438 +ShoalCave_HighTideEntranceRoom: .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 168 + .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc index 20d59a56f9..96d1e9d5e1 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc @@ -1,3 +1,3 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: @ 8536460 +ShoalCave_HighTideInnerRoom_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index f9983a781e..cdee5935a6 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_HighTideInnerRoom: @ 8484454 +ShoalCave_HighTideInnerRoom: .4byte ShoalCave_HighTideInnerRoom_Layout .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 169 + .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index 899ad3eb84..39b462ba8b 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,13 +1,13 @@ -ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C +ShoalCave_LowTideEntranceRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 -ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC +ShoalCave_LowTideEntranceRoom_MapWarps: warp_def 20, 30, 3, 0, MAP_ROUTE125 warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM -ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC +ShoalCave_LowTideEntranceRoom_MapEvents:: map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 656df81888..cf1600b531 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideEntranceRoom: @ 84843C8 +ShoalCave_LowTideEntranceRoom: .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 164 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 99ab134751..57c4f580be 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 +ShoalCave_LowTideIceRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE -ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 +ShoalCave_LowTideIceRoom_MapWarps: warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM -ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138 +ShoalCave_LowTideIceRoom_MapEvents:: map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 58669c0c6a..a05edf096a 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom: @ 84847D4 +ShoalCave_LowTideIceRoom: .4byte ShoalCave_LowTideIceRoom_Layout .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 328 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 4f446148ea..8a4d0b7a98 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,7 +1,7 @@ -ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 +ShoalCave_LowTideInnerRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY -ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 +ShoalCave_LowTideInnerRoom_MapWarps: warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM @@ -11,7 +11,7 @@ ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM -ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 +ShoalCave_LowTideInnerRoom_MapBGEvents: bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8 bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA @@ -19,6 +19,6 @@ ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028 bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A -ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 +ShoalCave_LowTideInnerRoom_MapEvents:: map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 7f21d0a22d..431d599858 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideInnerRoom: @ 84843E4 +ShoalCave_LowTideInnerRoom: .4byte ShoalCave_LowTideInnerRoom_Layout .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 165 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index b487edcd7d..226f351e4c 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,16 +1,16 @@ -ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC +ShoalCave_LowTideLowerRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 -ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C +ShoalCave_LowTideLowerRoom_MapWarps: warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM -ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C +ShoalCave_LowTideLowerRoom_MapBGEvents: bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 -ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 +ShoalCave_LowTideLowerRoom_MapEvents:: map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 21ea185eaa..490825d06d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideLowerRoom: @ 848441C +ShoalCave_LowTideLowerRoom: .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 167 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 6dbf50eb54..640d153f7a 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,13 +1,13 @@ -ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 +ShoalCave_LowTideStairsRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL -ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC +ShoalCave_LowTideStairsRoom_MapWarps: warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM -ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC +ShoalCave_LowTideStairsRoom_MapBGEvents: bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A -ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 +ShoalCave_LowTideStairsRoom_MapEvents:: map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 7d7089f854..3454cf1f64 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideStairsRoom: @ 8484400 +ShoalCave_LowTideStairsRoom: .4byte ShoalCave_LowTideStairsRoom_Layout .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 166 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index b43b505bd5..cc422090e9 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,14 +1,14 @@ -SingleBattleColosseum_EventObjects: @ 8539D44 +SingleBattleColosseum_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 -SingleBattleColosseum_MapWarps: @ 8539D5C +SingleBattleColosseum_MapWarps: warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE -SingleBattleColosseum_MapCoordEvents: @ 8539D6C +SingleBattleColosseum_MapCoordEvents: coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E -SingleBattleColosseum_MapEvents:: @ 8539D8C +SingleBattleColosseum_MapEvents:: map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index ac5f23b1e1..9bf35edca8 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,10 +1,10 @@ -SingleBattleColosseum: @ 8484D30 +SingleBattleColosseum: .4byte SingleBattleColosseum_Layout .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 221 + .2byte LAYOUT_SINGLE_BATTLE_COLOSSEUM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc index 59ac1aac0d..eb6f98b7d0 100644 --- a/data/maps/SkyPillar_1F/events.inc +++ b/data/maps/SkyPillar_1F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_1F_MapWarps: @ 8537058 +SkyPillar_1F_MapWarps: warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F -SkyPillar_1F_MapEvents:: @ 8537070 +SkyPillar_1F_MapEvents:: map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 9f76317d8d..83082ecc05 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_1F: @ 8484764 +SkyPillar_1F: .4byte SkyPillar_1F_Layout .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 322 + .2byte LAYOUT_SKY_PILLAR_1F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc index 780db9cccd..3b4b279152 100644 --- a/data/maps/SkyPillar_2F/events.inc +++ b/data/maps/SkyPillar_2F/events.inc @@ -1,7 +1,7 @@ -SkyPillar_2F_MapWarps: @ 8537084 +SkyPillar_2F_MapWarps: warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F -SkyPillar_2F_MapEvents:: @ 8537094 +SkyPillar_2F_MapEvents:: map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 8335107025..46141edca1 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_2F: @ 8484780 +SkyPillar_2F: .4byte SkyPillar_2F_Layout .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 323 + .2byte LAYOUT_SKY_PILLAR_2F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc index 2e7697395a..8e3f498dc8 100644 --- a/data/maps/SkyPillar_3F/events.inc +++ b/data/maps/SkyPillar_3F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_3F_MapWarps: @ 85370A8 +SkyPillar_3F_MapWarps: warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F -SkyPillar_3F_MapEvents:: @ 85370C0 +SkyPillar_3F_MapEvents:: map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 5381079f63..9b4ab53f02 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_3F: @ 848479C +SkyPillar_3F: .4byte SkyPillar_3F_Layout .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 324 + .2byte LAYOUT_SKY_PILLAR_3F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc index 248e36f958..ce0cdd2e37 100644 --- a/data/maps/SkyPillar_4F/events.inc +++ b/data/maps/SkyPillar_4F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_4F_MapWarps: @ 85370D4 +SkyPillar_4F_MapWarps: warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F -SkyPillar_4F_MapEvents:: @ 85370EC +SkyPillar_4F_MapEvents:: map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index ff91215e06..be6e9e66ad 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_4F: @ 84847B8 +SkyPillar_4F: .4byte SkyPillar_4F_Layout .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 325 + .2byte LAYOUT_SKY_PILLAR_4F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc index c0acb14c08..b3ad7b0f79 100644 --- a/data/maps/SkyPillar_5F/events.inc +++ b/data/maps/SkyPillar_5F/events.inc @@ -1,7 +1,7 @@ -SkyPillar_5F_MapWarps: @ 853714C +SkyPillar_5F_MapWarps: warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP -SkyPillar_5F_MapEvents:: @ 853715C +SkyPillar_5F_MapEvents:: map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 06618c7667..8fa59173bb 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_5F: @ 84847F0 +SkyPillar_5F: .4byte SkyPillar_5F_Layout .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 330 + .2byte LAYOUT_SKY_PILLAR_5F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc index 92cf0da9bf..ca0647e3ff 100644 --- a/data/maps/SkyPillar_Entrance/events.inc +++ b/data/maps/SkyPillar_Entrance/events.inc @@ -1,7 +1,7 @@ -SkyPillar_Entrance_MapWarps: @ 8536FF8 +SkyPillar_Entrance_MapWarps: warp_def 6, 16, 3, 0, MAP_ROUTE131 warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE -SkyPillar_Entrance_MapEvents:: @ 8537008 +SkyPillar_Entrance_MapEvents:: map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 434b1f85a1..5326495a63 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Entrance: @ 848472C +SkyPillar_Entrance: .4byte SkyPillar_Entrance_Layout .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 320 + .2byte LAYOUT_SKY_PILLAR_ENTRANCE .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc index 9519d12482..90de89d64a 100644 --- a/data/maps/SkyPillar_Outside/events.inc +++ b/data/maps/SkyPillar_Outside/events.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside_EventObjects: @ 853701C +SkyPillar_Outside_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE -SkyPillar_Outside_MapWarps: @ 8537034 +SkyPillar_Outside_MapWarps: warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F -SkyPillar_Outside_MapEvents:: @ 8537044 +SkyPillar_Outside_MapEvents:: map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 3ca072c808..3b60eaef2c 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside: @ 8484748 +SkyPillar_Outside: .4byte SkyPillar_Outside_Layout .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 321 + .2byte LAYOUT_SKY_PILLAR_OUTSIDE .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index a47e5e77f6..23edf5bb26 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,13 +1,13 @@ -SkyPillar_Top_EventObjects: @ 8537170 +SkyPillar_Top_EventObjects: object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT -SkyPillar_Top_MapWarps: @ 85371A0 +SkyPillar_Top_MapWarps: warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F -SkyPillar_Top_MapCoordEvents: @ 85371A8 +SkyPillar_Top_MapCoordEvents: coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A -SkyPillar_Top_MapEvents:: @ 85371B8 +SkyPillar_Top_MapEvents:: map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 07dbd38bb4..a4ab735e05 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Top: @ 848480C +SkyPillar_Top: .4byte SkyPillar_Top_Layout .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 331 + .2byte LAYOUT_SKY_PILLAR_TOP .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index 1485b313b6..09e0b790aa 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,9 +1,9 @@ -SlateportCity_MapConnectionsList: @ 84866F4 +SlateportCity_MapConnectionsList: connection up, 0, MAP_ROUTE110 connection down, 0, MAP_ROUTE109 connection right, 0, MAP_ROUTE134 -SlateportCity_MapConnections: @ 8486718 - .4byte 0x3 +SlateportCity_MapConnections: + .4byte 3 .4byte SlateportCity_MapConnectionsList diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 2987c2020e..ce576927c9 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -1,4 +1,4 @@ -SlateportCity_EventObjects: @ 85261CC +SlateportCity_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 @@ -35,7 +35,7 @@ SlateportCity_EventObjects: @ 85261CC object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT -SlateportCity_MapWarps: @ 8526514 +SlateportCity_MapWarps: warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F @@ -48,10 +48,10 @@ SlateportCity_MapWarps: @ 8526514 warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 -SlateportCity_MapCoordEvents: @ 852656C +SlateportCity_MapCoordEvents: coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC -SlateportCity_MapBGEvents: @ 852657C +SlateportCity_MapBGEvents: bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2 bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 @@ -66,6 +66,6 @@ SlateportCity_MapBGEvents: @ 852657C bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643 -SlateportCity_MapEvents:: @ 8526618 +SlateportCity_MapEvents:: map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index b8454f6560..3a6e145342 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -1,10 +1,10 @@ -SlateportCity: @ 84824D4 +SlateportCity: .4byte SlateportCity_Layout .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections .2byte MUS_FINECITY - .2byte 2 + .2byte LAYOUT_SLATEPORT_CITY .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc index 71e8d6d3a2..2dae031383 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC +SlateportCity_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 +SlateportCity_BattleTentBattleRoom_MapEvents:: map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index e9044f1e9c..ff2970197c 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentBattleRoom: @ 848314C +SlateportCity_BattleTentBattleRoom: .4byte BattleTentBattleRoom_Layout .4byte SlateportCity_BattleTentBattleRoom_MapEvents .4byte SlateportCity_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 386 + .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc index 4fe072b505..f165ab2fa1 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 +SlateportCity_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 +SlateportCity_BattleTentCorridor_MapEvents:: map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 0a273edef0..d1e0a8911b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentCorridor: @ 8483130 +SlateportCity_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte SlateportCity_BattleTentCorridor_MapEvents .4byte SlateportCity_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc index 3eadecd272..81a3499ec4 100644 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -1,17 +1,17 @@ -SlateportCity_BattleTentLobby_EventObjects: @ 852F408 +SlateportCity_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 -SlateportCity_BattleTentLobby_MapWarps: @ 852F480 +SlateportCity_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY -SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 +SlateportCity_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 -SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C +SlateportCity_BattleTentLobby_MapEvents:: map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 6bbbbf45fb..8b9df581e8 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentLobby: @ 8483114 +SlateportCity_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte SlateportCity_BattleTentLobby_MapEvents .4byte SlateportCity_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index e0781c2cb7..7984e29925 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,4 +1,4 @@ -SlateportCity_Harbor_EventObjects: @ 852FA68 +SlateportCity_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS @@ -8,18 +8,18 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW -SlateportCity_Harbor_MapWarps: @ 852FB28 +SlateportCity_Harbor_MapWarps: warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY -SlateportCity_Harbor_MapCoordEvents: @ 852FB48 +SlateportCity_Harbor_MapCoordEvents: coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7 coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3 coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF -SlateportCity_Harbor_MapEvents:: @ 852FB88 +SlateportCity_Harbor_MapEvents:: map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 922f84f1a7..24b39a88fb 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -1,10 +1,10 @@ -SlateportCity_Harbor: @ 84831D8 +SlateportCity_Harbor: .4byte Harbor_Layout .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 88 + .2byte LAYOUT_HARBOR .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc index 9917c0a246..a5fcfba7e8 100644 --- a/data/maps/SlateportCity_House1/events.inc +++ b/data/maps/SlateportCity_House1/events.inc @@ -1,10 +1,10 @@ -SlateportCity_House1_EventObjects: @ 852F538 +SlateportCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 -SlateportCity_House1_MapWarps: @ 852F550 +SlateportCity_House1_MapWarps: warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY -SlateportCity_House1_MapEvents:: @ 852F560 +SlateportCity_House1_MapEvents:: map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 1e48dfb549..2673a37168 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -1,10 +1,10 @@ -SlateportCity_House1: @ 8483168 +SlateportCity_House1: .4byte HouseWithBed_Layout .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc index 2dfffdaec3..eba48e548d 100644 --- a/data/maps/SlateportCity_House2/events.inc +++ b/data/maps/SlateportCity_House2/events.inc @@ -1,11 +1,11 @@ -SlateportCity_House2_EventObjects: @ 852FB9C +SlateportCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 -SlateportCity_House2_MapWarps: @ 852FBCC +SlateportCity_House2_MapWarps: warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY -SlateportCity_House2_MapEvents:: @ 852FBDC +SlateportCity_House2_MapEvents:: map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 6028d12fba..0e756ee4a6 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,10 +1,10 @@ -SlateportCity_House2: @ 84831F4 +SlateportCity_House2: .4byte House2_Layout .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc index 9cc5b9829a..a6d872630c 100644 --- a/data/maps/SlateportCity_Mart/events.inc +++ b/data/maps/SlateportCity_Mart/events.inc @@ -1,12 +1,12 @@ -SlateportCity_Mart_EventObjects: @ 852FCF0 +SlateportCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 -SlateportCity_Mart_MapWarps: @ 852FD38 +SlateportCity_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY -SlateportCity_Mart_MapEvents:: @ 852FD48 +SlateportCity_Mart_MapEvents:: map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 2d53ac8c39..a98e7bb902 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -1,10 +1,10 @@ -SlateportCity_Mart: @ 8483248 +SlateportCity_Mart: .4byte Mart_Layout .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index 8d727f4833..254506300f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 +SlateportCity_OceanicMuseum_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS @@ -14,16 +14,16 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION -SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 +SlateportCity_OceanicMuseum_1F_MapWarps: warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F -SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8 +SlateportCity_OceanicMuseum_1F_MapCoordEvents: coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 -SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 +SlateportCity_OceanicMuseum_1F_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 @@ -38,6 +38,6 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB -SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894 +SlateportCity_OceanicMuseum_1F_MapEvents:: map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index b75a12f600..0bf69b52a1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_OceanicMuseum_1F: @ 84831A0 +SlateportCity_OceanicMuseum_1F: .4byte SlateportCity_OceanicMuseum_1F_Layout .4byte SlateportCity_OceanicMuseum_1F_MapEvents .4byte SlateportCity_OceanicMuseum_1F_MapScripts .4byte 0x0 .2byte MUS_FUNE_KAN - .2byte 86 + .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 14499f35bd..b1cd4477a8 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 +SlateportCity_OceanicMuseum_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 @@ -7,10 +7,10 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION -SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 +SlateportCity_OceanicMuseum_2F_MapWarps: warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F -SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 +SlateportCity_OceanicMuseum_2F_MapBGEvents: bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 @@ -33,6 +33,6 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 -SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54 +SlateportCity_OceanicMuseum_2F_MapEvents:: map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index a571c2372e..8212c6be59 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_OceanicMuseum_2F: @ 84831BC +SlateportCity_OceanicMuseum_2F: .4byte SlateportCity_OceanicMuseum_2F_Layout .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 .2byte MUS_FUNE_KAN - .2byte 87 + .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index f5409bdf09..79442b1aab 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 +SlateportCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 -SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 +SlateportCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F -SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50 +SlateportCity_PokemonCenter_1F_MapEvents:: map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 37f19272d8..aee6e2e1cc 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonCenter_1F: @ 8483210 +SlateportCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index c28c3111ac..34f7fe078d 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 +SlateportCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 +SlateportCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC +SlateportCity_PokemonCenter_2F_MapEvents:: map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 1cac2f35ed..bc9640581f 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonCenter_2F: @ 848322C +SlateportCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 74b2a6acf3..861d9cb62a 100644 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -1,4 +1,4 @@ -SlateportCity_PokemonFanClub_EventObjects: @ 852F574 +SlateportCity_PokemonFanClub_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 @@ -9,10 +9,10 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 -SlateportCity_PokemonFanClub_MapWarps: @ 852F64C +SlateportCity_PokemonFanClub_MapWarps: warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY -SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C +SlateportCity_PokemonFanClub_MapEvents:: map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index b3b0dc8995..29e6816a3e 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonFanClub: @ 8483184 +SlateportCity_PokemonFanClub: .4byte SlateportCity_PokemonFanClub_Layout .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 85 + .2byte LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index 5bad8c5e21..052ccd9659 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -1,14 +1,14 @@ -SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 +SlateportCity_SternsShipyard_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY -SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 +SlateportCity_SternsShipyard_1F_MapWarps: warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F -SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390 +SlateportCity_SternsShipyard_1F_MapEvents:: map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index e702530ef6..3731923e2d 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_SternsShipyard_1F: @ 84830DC +SlateportCity_SternsShipyard_1F: .4byte SlateportCity_SternsShipyard_1F_Layout .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 81 + .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index f34a527264..2e48eb8b4d 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -1,11 +1,11 @@ -SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 +SlateportCity_SternsShipyard_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 -SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC +SlateportCity_SternsShipyard_2F_MapWarps: warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F -SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4 +SlateportCity_SternsShipyard_2F_MapEvents:: map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 8139d7604c..094f9fdec1 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_SternsShipyard_2F: @ 84830F8 +SlateportCity_SternsShipyard_2F: .4byte SlateportCity_SternsShipyard_2F_Layout .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 82 + .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 9ca0bb20d3..6592c293d9 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,4 +1,4 @@ -SootopolisCity_EventObjects: @ 8527314 +SootopolisCity_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 @@ -18,7 +18,7 @@ SootopolisCity_EventObjects: @ 8527314 object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE -SootopolisCity_MapWarps: @ 85274C4 +SootopolisCity_MapWarps: warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F @@ -33,7 +33,7 @@ SootopolisCity_MapWarps: @ 85274C4 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F -SootopolisCity_MapBGEvents: @ 852752C +SootopolisCity_MapBGEvents: bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 @@ -41,6 +41,6 @@ SootopolisCity_MapBGEvents: @ 852752C bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154 -SootopolisCity_MapEvents:: @ 8527574 +SootopolisCity_MapEvents:: map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 1b6832fbe9..0d12af500a 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,10 +1,10 @@ -SootopolisCity: @ 848257C +SootopolisCity: .4byte SootopolisCity_Layout .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 8 + .2byte LAYOUT_SOOTOPOLIS_CITY .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 36d8d7b274..288d78343a 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -1,16 +1,16 @@ -SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 +SootopolisCity_Gym_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 -SootopolisCity_Gym_1F_MapWarps: @ 8533024 +SootopolisCity_Gym_1F_MapWarps: warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F -SootopolisCity_Gym_1F_MapBGEvents: @ 853303C +SootopolisCity_Gym_1F_MapBGEvents: bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F -SootopolisCity_Gym_1F_MapEvents:: @ 8533054 +SootopolisCity_Gym_1F_MapEvents:: map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 1d71e09232..72e6fd2c81 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Gym_1F: @ 8483A28 +SootopolisCity_Gym_1F: .4byte SootopolisCity_Gym_1F_Layout .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 109 + .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 0ca0287add..2ef2609e7e 100644 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -1,4 +1,4 @@ -SootopolisCity_Gym_B1F_EventObjects: @ 8533068 +SootopolisCity_Gym_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 @@ -10,9 +10,9 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 -SootopolisCity_Gym_B1F_MapWarps: @ 8533158 +SootopolisCity_Gym_B1F_MapWarps: warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F -SootopolisCity_Gym_B1F_MapEvents:: @ 8533160 +SootopolisCity_Gym_B1F_MapEvents:: map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index c06afbc1b3..afa12fa9f2 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Gym_B1F: @ 8483A44 +SootopolisCity_Gym_B1F: .4byte SootopolisCity_Gym_B1F_Layout .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 110 + .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_B1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc index 38885d648a..64012784a7 100644 --- a/data/maps/SootopolisCity_House1/events.inc +++ b/data/maps/SootopolisCity_House1/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House1_EventObjects: @ 85332F8 +SootopolisCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 -SootopolisCity_House1_MapWarps: @ 8533328 +SootopolisCity_House1_MapWarps: warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY -SootopolisCity_House1_MapEvents:: @ 8533338 +SootopolisCity_House1_MapEvents:: map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index f7621f917b..af4cf939c4 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House1: @ 8483AB4 +SootopolisCity_House1: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc index 509eeb46fb..ea70cecb97 100644 --- a/data/maps/SootopolisCity_House2/events.inc +++ b/data/maps/SootopolisCity_House2/events.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2_EventObjects: @ 853334C +SootopolisCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 -SootopolisCity_House2_MapWarps: @ 8533364 +SootopolisCity_House2_MapWarps: warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY -SootopolisCity_House2_MapEvents:: @ 8533374 +SootopolisCity_House2_MapEvents:: map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index c329627185..42b7e14aa8 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2: @ 8483AD0 +SootopolisCity_House2: .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 308 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc index 5a91765c5d..d078de8ecc 100644 --- a/data/maps/SootopolisCity_House3/events.inc +++ b/data/maps/SootopolisCity_House3/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House3_EventObjects: @ 8533388 +SootopolisCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 -SootopolisCity_House3_MapWarps: @ 85333B8 +SootopolisCity_House3_MapWarps: warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY -SootopolisCity_House3_MapEvents:: @ 85333C8 +SootopolisCity_House3_MapEvents:: map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index bd90fabc00..0913505e13 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House3: @ 8483AEC +SootopolisCity_House3: .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 309 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc index 3bd0aed0e8..ce669cd756 100644 --- a/data/maps/SootopolisCity_House4/events.inc +++ b/data/maps/SootopolisCity_House4/events.inc @@ -1,12 +1,12 @@ -SootopolisCity_House4_EventObjects: @ 85333DC +SootopolisCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 -SootopolisCity_House4_MapWarps: @ 8533424 +SootopolisCity_House4_MapWarps: warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY -SootopolisCity_House4_MapEvents:: @ 8533434 +SootopolisCity_House4_MapEvents:: map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index f715682877..1266c68fec 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House4: @ 8483B08 +SootopolisCity_House4: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc index 321de8b64a..fa6d0452dd 100644 --- a/data/maps/SootopolisCity_House5/events.inc +++ b/data/maps/SootopolisCity_House5/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House5_EventObjects: @ 8533448 +SootopolisCity_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 -SootopolisCity_House5_MapWarps: @ 8533478 +SootopolisCity_House5_MapWarps: warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY -SootopolisCity_House5_MapEvents:: @ 8533488 +SootopolisCity_House5_MapEvents:: map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index d3d90fb055..0b1b3664ca 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House5: @ 8483B24 +SootopolisCity_House5: .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 308 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc index 40fd1d0a77..c89c135386 100644 --- a/data/maps/SootopolisCity_House6/events.inc +++ b/data/maps/SootopolisCity_House6/events.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6_EventObjects: @ 853349C +SootopolisCity_House6_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 -SootopolisCity_House6_MapWarps: @ 85334B4 +SootopolisCity_House6_MapWarps: warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY -SootopolisCity_House6_MapEvents:: @ 85334C4 +SootopolisCity_House6_MapEvents:: map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index e3daef4ed2..3268fbf09a 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6: @ 8483B40 +SootopolisCity_House6: .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 309 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc index d2f4e1ff20..e978cb8d4f 100644 --- a/data/maps/SootopolisCity_House7/events.inc +++ b/data/maps/SootopolisCity_House7/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House7_EventObjects: @ 85334D8 +SootopolisCity_House7_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 -SootopolisCity_House7_MapWarps: @ 8533508 +SootopolisCity_House7_MapWarps: warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY -SootopolisCity_House7_MapEvents:: @ 8533518 +SootopolisCity_House7_MapEvents:: map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index db988ed22c..0398f1cf77 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House7: @ 8483B5C +SootopolisCity_House7: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc index 07c18bae5b..da5b123fe6 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -1,15 +1,15 @@ -SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C +SootopolisCity_LotadAndSeedotHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 -SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C +SootopolisCity_LotadAndSeedotHouse_MapWarps: warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY -SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C +SootopolisCity_LotadAndSeedotHouse_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B -SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584 +SootopolisCity_LotadAndSeedotHouse_MapEvents:: map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 47f68b58fe..35da7aa8bc 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_LotadAndSeedotHouse: @ 8483B78 +SootopolisCity_LotadAndSeedotHouse: .4byte SootopolisCity_LotadAndSeedotHouse_Layout .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 297 + .2byte LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc index 32fc081d23..0fb940fd9f 100644 --- a/data/maps/SootopolisCity_Mart/events.inc +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -1,12 +1,12 @@ -SootopolisCity_Mart_EventObjects: @ 853328C +SootopolisCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 -SootopolisCity_Mart_MapWarps: @ 85332D4 +SootopolisCity_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY -SootopolisCity_Mart_MapEvents:: @ 85332E4 +SootopolisCity_Mart_MapEvents:: map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 131540c7ac..5b5ad1a01a 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Mart: @ 8483A98 +SootopolisCity_Mart: .4byte Mart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc index 65a2655784..560e693cf7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 +SootopolisCity_MysteryEventsHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 -SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 +SootopolisCity_MysteryEventsHouse_1F_MapWarps: warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F -SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8 +SootopolisCity_MysteryEventsHouse_1F_MapEvents:: map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 153be53cba..bf7d813210 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 +SootopolisCity_MysteryEventsHouse_1F: .4byte SootopolisCity_MysteryEventsHouse_1F_Layout .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 439 + .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc index 5cdbf05590..816cbaecc9 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc @@ -1,9 +1,9 @@ -SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC +SootopolisCity_MysteryEventsHouse_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 -SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 +SootopolisCity_MysteryEventsHouse_B1F_MapWarps: warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F -SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC +SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index e0355b0745..ee7def94c2 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 +SootopolisCity_MysteryEventsHouse_B1F: .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 440 + .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index b5a221dadd..743ba0ccbc 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 +SootopolisCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 -SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 +SootopolisCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F -SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC +SootopolisCity_PokemonCenter_1F_MapEvents:: map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 75da1fc474..972cf28e4c 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_PokemonCenter_1F: @ 8483A60 +SootopolisCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 0062c87e1f..e8fb6e09f1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 +SootopolisCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 +SootopolisCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278 +SootopolisCity_PokemonCenter_2F_MapEvents:: map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index f9e1c51896..03ab97ea5a 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_PokemonCenter_2F: @ 8483A7C +SootopolisCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 14dc7169bc..eeb21d3af4 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -1,14 +1,14 @@ -SouthernIsland_Exterior_EventObjects: @ 853B83C +SouthernIsland_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 -SouthernIsland_Exterior_MapWarps: @ 853B86C +SouthernIsland_Exterior_MapWarps: warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR -SouthernIsland_Exterior_MapBGEvents: @ 853B87C +SouthernIsland_Exterior_MapBGEvents: bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C -SouthernIsland_Exterior_MapEvents:: @ 853B888 +SouthernIsland_Exterior_MapEvents:: map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 4aa0eff1a3..1288fbdf50 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,10 +1,10 @@ -SouthernIsland_Exterior: @ 8485238 +SouthernIsland_Exterior: .4byte SouthernIsland_Exterior_Layout .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 290 + .2byte LAYOUT_SOUTHERN_ISLAND_EXTERIOR .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index 000386c337..190762f5ba 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,14 +1,14 @@ -SouthernIsland_Interior_EventObjects: @ 853B89C +SouthernIsland_Interior_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON -SouthernIsland_Interior_MapWarps: @ 853B8CC +SouthernIsland_Interior_MapWarps: warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR -SouthernIsland_Interior_MapBGEvents: @ 853B8DC +SouthernIsland_Interior_MapBGEvents: bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 -SouthernIsland_Interior_MapEvents:: @ 853B8E8 +SouthernIsland_Interior_MapEvents:: map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index b1238c4f75..95eb61d7c3 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,10 +1,10 @@ -SouthernIsland_Interior: @ 8485254 +SouthernIsland_Interior: .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 291 + .2byte LAYOUT_SOUTHERN_ISLAND_INTERIOR .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index 553b4151ab..f20abd8fd4 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -1,12 +1,12 @@ -TerraCave_End_EventObjects: @ 8537850 +TerraCave_End_EventObjects: object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON -TerraCave_End_MapWarps: @ 8537868 +TerraCave_End_MapWarps: warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE -TerraCave_End_MapCoordEvents: @ 8537870 +TerraCave_End_MapCoordEvents: coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC -TerraCave_End_MapEvents:: @ 8537880 +TerraCave_End_MapEvents:: map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 8ba9f7d456..f95ac38b8c 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -1,10 +1,10 @@ -TerraCave_End: @ 8484A3C +TerraCave_End: .4byte TerraCave_End_Layout .4byte TerraCave_End_MapEvents .4byte TerraCave_End_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 409 + .2byte LAYOUT_TERRA_CAVE_END .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc index a176c548db..bfa4092fdf 100644 --- a/data/maps/TerraCave_Entrance/events.inc +++ b/data/maps/TerraCave_Entrance/events.inc @@ -1,7 +1,7 @@ -TerraCave_Entrance_MapWarps: @ 853782C +TerraCave_Entrance_MapWarps: warp_def 8, 18, 0, 127, MAP_NONE warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END -TerraCave_Entrance_MapEvents:: @ 853783C +TerraCave_Entrance_MapEvents:: map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index b75c867993..5ede2a4487 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -1,10 +1,10 @@ -TerraCave_Entrance: @ 8484A20 +TerraCave_Entrance: .4byte TerraCave_Entrance_Layout .4byte TerraCave_Entrance_MapEvents .4byte TerraCave_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 408 + .2byte LAYOUT_TERRA_CAVE_ENTRANCE .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 8991b6aab2..79faca7e65 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,14 +1,14 @@ -TradeCenter_EventObjects: @ 8539DA0 +TradeCenter_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 -TradeCenter_MapWarps: @ 8539DB8 +TradeCenter_MapWarps: warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE -TradeCenter_MapCoordEvents: @ 8539DC8 +TradeCenter_MapCoordEvents: coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF -TradeCenter_MapEvents:: @ 8539DE8 +TradeCenter_MapEvents:: map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 9b621cb026..80a11cd52f 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,10 +1,10 @@ -TradeCenter: @ 8484D4C +TradeCenter: .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 222 + .2byte LAYOUT_TRADE_CENTER .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc index 2a2428f57d..21e62b951f 100644 --- a/data/maps/TrainerHill_1F/events.inc +++ b/data/maps/TrainerHill_1F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_1F_MapWarps: @ 853D934 +TrainerHill_1F_MapWarps: warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F -TrainerHill_1F_MapEvents:: @ 853D944 +TrainerHill_1F_MapEvents:: map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 3c6b581191..a3654edf2a 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_1F: @ 84857E8 +TrainerHill_1F: .4byte TrainerHill_1F_Layout .4byte TrainerHill_1F_MapEvents .4byte TrainerHill_1F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 415 + .2byte LAYOUT_TRAINER_HILL_1F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc index ca50380d5f..4752e33cdc 100644 --- a/data/maps/TrainerHill_2F/events.inc +++ b/data/maps/TrainerHill_2F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_2F_MapWarps: @ 853D958 +TrainerHill_2F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F -TrainerHill_2F_MapEvents:: @ 853D968 +TrainerHill_2F_MapEvents:: map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index d8343060c7..2f607baff6 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_2F: @ 8485804 +TrainerHill_2F: .4byte TrainerHill_2F_Layout .4byte TrainerHill_2F_MapEvents .4byte TrainerHill_2F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 416 + .2byte LAYOUT_TRAINER_HILL_2F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc index e12394655b..5de009a47c 100644 --- a/data/maps/TrainerHill_3F/events.inc +++ b/data/maps/TrainerHill_3F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_3F_MapWarps: @ 853D97C +TrainerHill_3F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F -TrainerHill_3F_MapEvents:: @ 853D98C +TrainerHill_3F_MapEvents:: map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index db82eb277f..4dd8e394fb 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_3F: @ 8485820 +TrainerHill_3F: .4byte TrainerHill_3F_Layout .4byte TrainerHill_3F_MapEvents .4byte TrainerHill_3F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 417 + .2byte LAYOUT_TRAINER_HILL_3F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc index e9696de151..05f6e89178 100644 --- a/data/maps/TrainerHill_4F/events.inc +++ b/data/maps/TrainerHill_4F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_4F_MapWarps: @ 853D9A0 +TrainerHill_4F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF -TrainerHill_4F_MapEvents:: @ 853D9B0 +TrainerHill_4F_MapEvents:: map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index d699f53d57..4f370c5d98 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_4F: @ 848583C +TrainerHill_4F: .4byte TrainerHill_4F_Layout .4byte TrainerHill_4F_MapEvents .4byte TrainerHill_4F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 418 + .2byte LAYOUT_TRAINER_HILL_4F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc index 0125c99361..c0336a267a 100644 --- a/data/maps/TrainerHill_Elevator/events.inc +++ b/data/maps/TrainerHill_Elevator/events.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator_EventObjects: @ 853DD84 +TrainerHill_Elevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 -TrainerHill_Elevator_MapWarps: @ 853DD9C +TrainerHill_Elevator_MapWarps: warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF -TrainerHill_Elevator_MapEvents:: @ 853DDAC +TrainerHill_Elevator_MapEvents:: map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 936b7712dd..5eeaa994be 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator: @ 8485ADC +TrainerHill_Elevator: .4byte BattleElevator_Layout .4byte TrainerHill_Elevator_MapEvents .4byte TrainerHill_Elevator_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 266 + .2byte LAYOUT_BATTLE_ELEVATOR .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 30817defc3..ddc3f3f094 100644 --- a/data/maps/TrainerHill_Entrance/events.inc +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -1,21 +1,21 @@ -TrainerHill_Entrance_EventObjects: @ 853D874 +TrainerHill_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 -TrainerHill_Entrance_MapWarps: @ 853D8EC +TrainerHill_Entrance_MapWarps: warp_def 9, 16, 3, 4, MAP_ROUTE111 warp_def 10, 16, 3, 4, MAP_ROUTE111 warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F -TrainerHill_Entrance_MapCoordEvents: @ 853D904 +TrainerHill_Entrance_MapCoordEvents: coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 -TrainerHill_Entrance_MapBGEvents: @ 853D914 +TrainerHill_Entrance_MapBGEvents: bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 -TrainerHill_Entrance_MapEvents:: @ 853D920 +TrainerHill_Entrance_MapEvents:: map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 79d6c8b961..26e215a6e8 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Entrance: @ 84857CC +TrainerHill_Entrance: .4byte TrainerHill_Entrance_Layout .4byte TrainerHill_Entrance_MapEvents .4byte TrainerHill_Entrance_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 414 + .2byte LAYOUT_TRAINER_HILL_ENTRANCE .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc index eeab57317c..0a3b361c4c 100644 --- a/data/maps/TrainerHill_Roof/events.inc +++ b/data/maps/TrainerHill_Roof/events.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof_EventObjects: @ 853D9C4 +TrainerHill_Roof_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 -TrainerHill_Roof_MapWarps: @ 853D9DC +TrainerHill_Roof_MapWarps: warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR -TrainerHill_Roof_MapEvents:: @ 853D9EC +TrainerHill_Roof_MapEvents:: map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 9f0b0dd3ba..c27cb3b5ac 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof: @ 8485858 +TrainerHill_Roof: .4byte TrainerHill_Roof_Layout .4byte TrainerHill_Roof_MapEvents .4byte TrainerHill_Roof_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 419 + .2byte LAYOUT_TRAINER_HILL_ROOF .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index b0b1aa108a..01c45b11b0 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,8 +1,8 @@ -Underwater1_MapConnectionsList: @ 8486D38 +Underwater1_MapConnectionsList: connection down, 0, MAP_UNDERWATER2 connection emerge, 0, MAP_ROUTE124 -Underwater1_MapConnections: @ 8486D50 - .4byte 0x2 +Underwater1_MapConnections: + .4byte 2 .4byte Underwater1_MapConnectionsList diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc index 7d3866eb01..ef329306f8 100644 --- a/data/maps/Underwater1/events.inc +++ b/data/maps/Underwater1/events.inc @@ -1,4 +1,4 @@ -Underwater1_MapBGEvents: @ 852CEB4 +Underwater1_MapBGEvents: bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL @@ -7,6 +7,6 @@ Underwater1_MapBGEvents: @ 852CEB4 bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 -Underwater1_MapEvents:: @ 852CF08 +Underwater1_MapEvents:: map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 7cf9542992..06ab5f3832 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,10 +1,10 @@ -Underwater1: @ 8482A30 +Underwater1: .4byte Underwater1_Layout .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP - .2byte 274 + .2byte LAYOUT_UNDERWATER1 .byte MAPSEC_UNDERWATER_124 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 11df3eaec0..74f11e5afc 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,9 +1,9 @@ -Underwater2_MapConnectionsList: @ 8486D6C +Underwater2_MapConnectionsList: connection up, 0, MAP_UNDERWATER1 connection right, 0, MAP_UNDERWATER3 connection emerge, 0, MAP_ROUTE126 -Underwater2_MapConnections: @ 8486D90 - .4byte 0x3 +Underwater2_MapConnections: + .4byte 3 .4byte Underwater2_MapConnectionsList diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc index dd24215063..b4127fc15e 100644 --- a/data/maps/Underwater2/events.inc +++ b/data/maps/Underwater2/events.inc @@ -1,7 +1,7 @@ -Underwater2_MapWarps: @ 852CF1C +Underwater2_MapWarps: warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY -Underwater2_MapBGEvents: @ 852CF24 +Underwater2_MapBGEvents: bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST @@ -11,6 +11,6 @@ Underwater2_MapBGEvents: @ 852CF24 bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD -Underwater2_MapEvents:: @ 852CF84 +Underwater2_MapEvents:: map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index a4c14ab289..d1b11aa62d 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,10 +1,10 @@ -Underwater2: @ 8482A4C +Underwater2: .4byte Underwater2_Layout .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP - .2byte 51 + .2byte LAYOUT_UNDERWATER2 .byte MAPSEC_UNDERWATER_125 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index db8b0947b8..e0e6226def 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,9 +1,9 @@ -Underwater3_MapConnectionsList: @ 8486D98 +Underwater3_MapConnectionsList: connection emerge, 0, MAP_ROUTE127 connection left, 0, MAP_UNDERWATER2 connection down, 0, MAP_UNDERWATER4 -Underwater3_MapConnections: @ 8486DBC - .4byte 0x3 +Underwater3_MapConnections: + .4byte 3 .4byte Underwater3_MapConnectionsList diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc index 02ac86aa12..92964db38d 100644 --- a/data/maps/Underwater3/events.inc +++ b/data/maps/Underwater3/events.inc @@ -1,13 +1,13 @@ -Underwater3_MapWarps: @ 852CF98 +Underwater3_MapWarps: warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater3_MapBGEvents: @ 852CFA8 +Underwater3_MapBGEvents: bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD -Underwater3_MapEvents:: @ 852CFD8 +Underwater3_MapEvents:: map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 4e91eb687d..1722cfdd83 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,10 +1,10 @@ -Underwater3: @ 8482A68 +Underwater3: .4byte Underwater3_Layout .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP - .2byte 52 + .2byte LAYOUT_UNDERWATER3 .byte MAPSEC_UNDERWATER_126 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 8a63d54a46..c1701e1ddd 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,8 +1,8 @@ -Underwater4_MapConnectionsList: @ 8486DC4 +Underwater4_MapConnectionsList: connection up, 0, MAP_UNDERWATER3 connection emerge, 0, MAP_ROUTE128 -Underwater4_MapConnections: @ 8486DDC - .4byte 0x2 +Underwater4_MapConnections: + .4byte 2 .4byte Underwater4_MapConnectionsList diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc index 5a08e82f95..4bdc98caf2 100644 --- a/data/maps/Underwater4/events.inc +++ b/data/maps/Underwater4/events.inc @@ -1,10 +1,10 @@ -Underwater4_MapWarps: @ 852CFEC +Underwater4_MapWarps: warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN -Underwater4_MapBGEvents: @ 852CFF4 +Underwater4_MapBGEvents: bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL -Underwater4_MapEvents:: @ 852D00C +Underwater4_MapEvents:: map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 804fb1d14a..2b9975a907 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,10 +1,10 @@ -Underwater4: @ 8482A84 +Underwater4: .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP - .2byte 53 + .2byte LAYOUT_UNDERWATER4 .byte MAPSEC_UNDERWATER_127 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc index 15a3322edb..c082452d30 100644 --- a/data/maps/Underwater5/connections.inc +++ b/data/maps/Underwater5/connections.inc @@ -1,7 +1,7 @@ -Underwater5_MapConnectionsList: @ 8486DE4 +Underwater5_MapConnectionsList: connection emerge, 0, MAP_ROUTE129 -Underwater5_MapConnections: @ 8486DF0 - .4byte 0x1 +Underwater5_MapConnections: + .4byte 1 .4byte Underwater5_MapConnectionsList diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc index 4b902cf963..5b5c58cf47 100644 --- a/data/maps/Underwater5/events.inc +++ b/data/maps/Underwater5/events.inc @@ -1,7 +1,7 @@ -Underwater5_MapWarps: @ 852D020 +Underwater5_MapWarps: warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater5_MapEvents:: @ 852D030 +Underwater5_MapEvents:: map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 8ad3b5ba28..3466acdf62 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -1,10 +1,10 @@ -Underwater5: @ 8482AA0 +Underwater5: .4byte Underwater5_Layout .4byte Underwater5_MapEvents .4byte Underwater5_MapScripts .4byte Underwater5_MapConnections .2byte MUS_DEEPDEEP - .2byte 412 + .2byte LAYOUT_UNDERWATER5 .byte MAPSEC_UNDERWATER_129 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc index 432ab625f9..8e051ea550 100644 --- a/data/maps/Underwater6/connections.inc +++ b/data/maps/Underwater6/connections.inc @@ -1,7 +1,7 @@ -Underwater6_MapConnectionsList: @ 8486D24 +Underwater6_MapConnectionsList: connection emerge, 0, MAP_ROUTE105 -Underwater6_MapConnections: @ 8486D30 - .4byte 0x1 +Underwater6_MapConnections: + .4byte 1 .4byte Underwater6_MapConnectionsList diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc index a624efba39..067bc5561e 100644 --- a/data/maps/Underwater6/events.inc +++ b/data/maps/Underwater6/events.inc @@ -1,7 +1,7 @@ -Underwater6_MapWarps: @ 852D044 +Underwater6_MapWarps: warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater6_MapEvents:: @ 852D054 +Underwater6_MapEvents:: map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 4e978a1e7f..5683868e27 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -1,10 +1,10 @@ -Underwater6: @ 8482ABC +Underwater6: .4byte Underwater6_Layout .4byte Underwater6_MapEvents .4byte Underwater6_MapScripts .4byte Underwater6_MapConnections .2byte MUS_DEEPDEEP - .2byte 410 + .2byte LAYOUT_UNDERWATER6 .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc index 82803997c1..7113f21e99 100644 --- a/data/maps/Underwater7/connections.inc +++ b/data/maps/Underwater7/connections.inc @@ -1,7 +1,7 @@ -Underwater7_MapConnectionsList: @ 8486D58 +Underwater7_MapConnectionsList: connection emerge, 0, MAP_ROUTE125 -Underwater7_MapConnections: @ 8486D64 - .4byte 0x1 +Underwater7_MapConnections: + .4byte 1 .4byte Underwater7_MapConnectionsList diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc index fba9324f6e..d4c2a882a8 100644 --- a/data/maps/Underwater7/events.inc +++ b/data/maps/Underwater7/events.inc @@ -1,7 +1,7 @@ -Underwater7_MapWarps: @ 852D068 +Underwater7_MapWarps: warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater7_MapEvents:: @ 852D078 +Underwater7_MapEvents:: map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 132eb867ee..a1fa2824c0 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -1,10 +1,10 @@ -Underwater7: @ 8482AD8 +Underwater7: .4byte Underwater7_Layout .4byte Underwater7_MapEvents .4byte Underwater7_MapScripts .4byte Underwater7_MapConnections .2byte MUS_DEEPDEEP - .2byte 411 + .2byte LAYOUT_UNDERWATER7 .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc index 685abaa163..b0da76440e 100644 --- a/data/maps/Underwater_MarineCave/events.inc +++ b/data/maps/Underwater_MarineCave/events.inc @@ -1,6 +1,6 @@ -Underwater_MarineCave_MapWarps: @ 85377B0 +Underwater_MarineCave_MapWarps: warp_def 9, 8, 0, 127, MAP_NONE -Underwater_MarineCave_MapEvents:: @ 85377B8 +Underwater_MarineCave_MapEvents:: map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 88fe213abd..1cc75bd542 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -1,10 +1,10 @@ -Underwater_MarineCave: @ 84849CC +Underwater_MarineCave: .4byte Underwater_MarineCave_Layout .4byte Underwater_MarineCave_MapEvents .4byte Underwater_MarineCave_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 406 + .2byte LAYOUT_UNDERWATER_MARINE_CAVE .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc index 3a5219511c..a514ccf725 100644 --- a/data/maps/Underwater_Route134/events.inc +++ b/data/maps/Underwater_Route134/events.inc @@ -1,6 +1,6 @@ -Underwater_Route134_MapWarps: @ 8536D44 +Underwater_Route134_MapWarps: warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER -Underwater_Route134_MapEvents:: @ 8536D4C +Underwater_Route134_MapEvents:: map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 591dffa534..07d1bcd8e7 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,10 +1,10 @@ -Underwater_Route134: @ 848464C +Underwater_Route134: .4byte Underwater_Route134_Layout .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 282 + .2byte LAYOUT_UNDERWATER_ROUTE134 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index 468dedcd67..d4c212a19b 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,12 +1,12 @@ -Underwater_SeafloorCavern_EventObjects: @ 8535640 +Underwater_SeafloorCavern_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE -Underwater_SeafloorCavern_MapWarps: @ 85356A0 +Underwater_SeafloorCavern_MapWarps: warp_def 6, 7, 0, 0, MAP_UNDERWATER4 -Underwater_SeafloorCavern_MapEvents:: @ 85356A8 +Underwater_SeafloorCavern_MapEvents:: map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 08eac747cf..0df694b901 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,10 +1,10 @@ -Underwater_SeafloorCavern: @ 8484198 +Underwater_SeafloorCavern: .4byte Underwater_SeafloorCavern_Layout .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 146 + .2byte LAYOUT_UNDERWATER_SEAFLOOR_CAVERN .byte MAPSEC_UNDERWATER_128 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index e0bb196429..e8b93885a5 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -1,9 +1,9 @@ -Underwater_SealedChamber_MapWarps: @ 8536D60 +Underwater_SealedChamber_MapWarps: warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 -Underwater_SealedChamber_MapBGEvents: @ 8536D68 +Underwater_SealedChamber_MapBGEvents: bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC -Underwater_SealedChamber_MapEvents:: @ 8536D74 +Underwater_SealedChamber_MapEvents:: map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 94fcc6ba74..f7117f905d 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,10 +1,10 @@ -Underwater_SealedChamber: @ 8484668 +Underwater_SealedChamber: .4byte Underwater_SealedChamber_Layout .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 283 + .2byte LAYOUT_UNDERWATER_SEALED_CHAMBER .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc index 78839e8a1c..3829ecb103 100644 --- a/data/maps/Underwater_SootopolisCity/events.inc +++ b/data/maps/Underwater_SootopolisCity/events.inc @@ -1,7 +1,7 @@ -Underwater_SootopolisCity_MapWarps: @ 8534330 +Underwater_SootopolisCity_MapWarps: warp_def 9, 8, 0, 0, MAP_UNDERWATER2 warp_def 10, 8, 0, 0, MAP_UNDERWATER2 -Underwater_SootopolisCity_MapEvents:: @ 8534340 +Underwater_SootopolisCity_MapEvents:: map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 1611026e01..31caf4011f 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,10 +1,10 @@ -Underwater_SootopolisCity: @ 8483F4C +Underwater_SootopolisCity: .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 130 + .2byte LAYOUT_UNDERWATER_SOOTOPOLIS_CITY .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc index 3ab6144685..c78b86eece 100644 --- a/data/maps/UnionRoom/events.inc +++ b/data/maps/UnionRoom/events.inc @@ -1,4 +1,4 @@ -UnionRoom_EventObjects: @ 853B020 +UnionRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 @@ -9,10 +9,10 @@ UnionRoom_EventObjects: @ 853B020 object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 -UnionRoom_MapWarps: @ 853B0F8 +UnionRoom_MapWarps: warp_def 7, 11, 3, 127, MAP_NONE warp_def 8, 11, 3, 127, MAP_NONE -UnionRoom_MapEvents:: @ 853B108 +UnionRoom_MapEvents:: map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 29fd3cc3fa..cc7e1c3d1d 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -1,10 +1,10 @@ -UnionRoom: @ 8485120 +UnionRoom: .4byte UnionRoom_Layout .4byte UnionRoom_MapEvents .4byte UnionRoom_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 393 + .2byte LAYOUT_UNION_ROOM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index aa4ffc0cdc..0520cd58aa 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_29: @ 8484DBC +UnknownMap_25_29: .4byte UnknownMap_25_29_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 226 + .2byte LAYOUT_UNKNOWN_MAP_25_29 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 86e2d4f704..ed085f46e2 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_30: @ 8484DD8 +UnknownMap_25_30: .4byte UnknownMap_25_30_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 227 + .2byte LAYOUT_UNKNOWN_MAP_25_30 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 78ede2d656..fde407fb83 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_31: @ 8484DF4 +UnknownMap_25_31: .4byte UnknownMap_25_31_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 228 + .2byte LAYOUT_UNKNOWN_MAP_25_31 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 8265281193..1f0655d54c 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_32: @ 8484E10 +UnknownMap_25_32: .4byte UnknownMap_25_32_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 229 + .2byte LAYOUT_UNKNOWN_MAP_25_32 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 99502bb0fe..71f5d3523a 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_33: @ 8484E2C +UnknownMap_25_33: .4byte UnknownMap_25_33_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 230 + .2byte LAYOUT_UNKNOWN_MAP_25_33 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 6e95a82224..8fc47f9389 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_34: @ 8484E48 +UnknownMap_25_34: .4byte UnknownMap_25_34_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 231 + .2byte LAYOUT_UNKNOWN_MAP_25_34 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index de6fdface3..805bab59e6 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,8 +1,8 @@ -VerdanturfTown_MapConnectionsList: @ 8486694 +VerdanturfTown_MapConnectionsList: connection up, -80, MAP_ROUTE116 connection right, 0, MAP_ROUTE117 -VerdanturfTown_MapConnections: @ 84866AC - .4byte 0x2 +VerdanturfTown_MapConnections: + .4byte 2 .4byte VerdanturfTown_MapConnectionsList diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 971ad87c4c..d5e99eeceb 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -1,10 +1,10 @@ -VerdanturfTown_EventObjects: @ 8527CDC +VerdanturfTown_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 -VerdanturfTown_MapWarps: @ 8527D3C +VerdanturfTown_MapWarps: warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F @@ -13,7 +13,7 @@ VerdanturfTown_MapWarps: @ 8527D3C warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE -VerdanturfTown_MapBGEvents: @ 8527D74 +VerdanturfTown_MapBGEvents: bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9 bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 @@ -23,6 +23,6 @@ VerdanturfTown_MapBGEvents: @ 8527D74 bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4 -VerdanturfTown_MapEvents:: @ 8527DD4 +VerdanturfTown_MapEvents:: map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 053a587129..c2e0109f60 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown: @ 8482640 +VerdanturfTown: .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 - .2byte 15 + .2byte LAYOUT_VERDANTURF_TOWN .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc index ee91fff2ca..fb424a0560 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 +VerdanturfTown_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C +VerdanturfTown_BattleTentBattleRoom_MapEvents:: map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 8a95c60a30..af844405ef 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentBattleRoom: @ 8482E90 +VerdanturfTown_BattleTentBattleRoom: .4byte VerdanturfTown_BattleTentBattleRoom_Layout .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 387 + .2byte LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc index d0ca880efe..b5a8f71fb2 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 +VerdanturfTown_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 +VerdanturfTown_BattleTentCorridor_MapEvents:: map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 5aa6fcc464..49e27d7f5f 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentCorridor: @ 8482E74 +VerdanturfTown_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte VerdanturfTown_BattleTentCorridor_MapEvents .4byte VerdanturfTown_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 1dfb49dd92..68ee1322fa 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -1,4 +1,4 @@ -VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 +VerdanturfTown_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 @@ -6,13 +6,13 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 -VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 +VerdanturfTown_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN -VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 +VerdanturfTown_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 -VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 +VerdanturfTown_BattleTentLobby_MapEvents:: map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 3f3eb1ae6f..012f55ec9b 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentLobby: @ 8482E58 +VerdanturfTown_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte VerdanturfTown_BattleTentLobby_MapEvents .4byte VerdanturfTown_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index 990bcd1f69..8d15647d63 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -1,11 +1,11 @@ -VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 +VerdanturfTown_FriendshipRatersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 -VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 +VerdanturfTown_FriendshipRatersHouse_MapWarps: warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN -VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08 +VerdanturfTown_FriendshipRatersHouse_MapEvents:: map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 43148f8efa..512004a3e0 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_FriendshipRatersHouse: @ 8482F1C +VerdanturfTown_FriendshipRatersHouse: .4byte House2_Layout .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc index d714aa8a0c..a5f61b86f6 100644 --- a/data/maps/VerdanturfTown_House/events.inc +++ b/data/maps/VerdanturfTown_House/events.inc @@ -1,11 +1,11 @@ -VerdanturfTown_House_EventObjects: @ 852EA1C +VerdanturfTown_House_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 -VerdanturfTown_House_MapWarps: @ 852EA4C +VerdanturfTown_House_MapWarps: warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN -VerdanturfTown_House_MapEvents:: @ 852EA5C +VerdanturfTown_House_MapEvents:: map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 5c3e26d09c..910126e298 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_House: @ 8482F38 +VerdanturfTown_House: .4byte House1_Layout .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc index 9ae237dc87..79e731fe4c 100644 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -1,13 +1,13 @@ -VerdanturfTown_Mart_EventObjects: @ 852E790 +VerdanturfTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 -VerdanturfTown_Mart_MapWarps: @ 852E7F0 +VerdanturfTown_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN -VerdanturfTown_Mart_MapEvents:: @ 852E800 +VerdanturfTown_Mart_MapEvents:: map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 0441f81477..e04be5fd60 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_Mart: @ 8482EAC +VerdanturfTown_Mart: .4byte Mart_Layout .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 246270361b..47449cd1b7 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 +VerdanturfTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 -VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 +VerdanturfTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F -VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C +VerdanturfTown_PokemonCenter_1F_MapEvents:: map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index e1d7d3fa8b..e2adc24a40 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_PokemonCenter_1F: @ 8482EC8 +VerdanturfTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index e3e959838f..a4e13db36e 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 +VerdanturfTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 +VerdanturfTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918 +VerdanturfTown_PokemonCenter_2F_MapEvents:: map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 933a3da18e..d64084b534 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_PokemonCenter_2F: @ 8482EE4 +VerdanturfTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index f8d6f4db51..940417c7a1 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_WandasHouse_EventObjects: @ 852E92C +VerdanturfTown_WandasHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN -VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 +VerdanturfTown_WandasHouse_MapWarps: warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN -VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4 +VerdanturfTown_WandasHouse_MapEvents:: map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 573fe6f76e..bb285600f9 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_WandasHouse: @ 8482F00 +VerdanturfTown_WandasHouse: .4byte VerdanturfTown_WandasHouse_Layout .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 76 + .2byte LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 05cafcc48b..1e34108edf 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_1F_EventObjects: @ 8535E04 +VictoryRoad_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 @@ -9,20 +9,20 @@ VictoryRoad_1F_EventObjects: @ 8535E04 object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 -VictoryRoad_1F_MapWarps: @ 8535EDC +VictoryRoad_1F_MapWarps: warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F -VictoryRoad_1F_MapCoordEvents: @ 8535F04 +VictoryRoad_1F_MapCoordEvents: coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 -VictoryRoad_1F_MapBGEvents: @ 8535F24 +VictoryRoad_1F_MapBGEvents: bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL -VictoryRoad_1F_MapEvents:: @ 8535F30 +VictoryRoad_1F_MapEvents:: map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 950f26aa5d..eb1e53c9b7 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_1F: @ 8484374 +VictoryRoad_1F: .4byte VictoryRoad_1F_Layout .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 163 + .2byte LAYOUT_VICTORY_ROAD_1F .byte MAPSEC_VICTORY_ROAD .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index 814d8a73db..35c4fe4285 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_B1F_EventObjects: @ 8535F44 +VictoryRoad_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11 @@ -21,7 +21,7 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 -VictoryRoad_B1F_MapWarps: @ 853613C +VictoryRoad_B1F_MapWarps: warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F @@ -30,6 +30,6 @@ VictoryRoad_B1F_MapWarps: @ 853613C warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F -VictoryRoad_B1F_MapEvents:: @ 8536174 +VictoryRoad_B1F_MapEvents:: map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index d89408de9d..cc0064fd67 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_B1F: @ 8484390 +VictoryRoad_B1F: .4byte VictoryRoad_B1F_Layout .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 285 + .2byte LAYOUT_VICTORY_ROAD_B1F .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index 1ad4f3e503..0bc77cade5 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_B2F_EventObjects: @ 8536188 +VictoryRoad_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 @@ -7,16 +7,16 @@ VictoryRoad_B2F_EventObjects: @ 8536188 object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 -VictoryRoad_B2F_MapWarps: @ 8536230 +VictoryRoad_B2F_MapWarps: warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F -VictoryRoad_B2F_MapBGEvents: @ 8536250 +VictoryRoad_B2F_MapBGEvents: bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL -VictoryRoad_B2F_MapEvents:: @ 8536268 +VictoryRoad_B2F_MapEvents:: map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 462898c2b3..0af51f9717 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_B2F: @ 84843AC +VictoryRoad_B2F: .4byte VictoryRoad_B2F_Layout .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 286 + .2byte LAYOUT_VICTORY_ROAD_B2F .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE diff --git a/include/constants/layouts.h b/include/constants/layouts.h new file mode 100755 index 0000000000..d12db9b33f --- /dev/null +++ b/include/constants/layouts.h @@ -0,0 +1,446 @@ +#ifndef GUARD_CONSTANTS_LAYOUTS_H +#define GUARD_CONSTANTS_LAYOUTS_H + +#define LAYOUT_PETALBURG_CITY 1 +#define LAYOUT_SLATEPORT_CITY 2 +#define LAYOUT_MAUVILLE_CITY 3 +#define LAYOUT_RUSTBORO_CITY 4 +#define LAYOUT_FORTREE_CITY 5 +#define LAYOUT_LILYCOVE_CITY 6 +#define LAYOUT_MOSSDEEP_CITY 7 +#define LAYOUT_SOOTOPOLIS_CITY 8 +#define LAYOUT_EVER_GRANDE_CITY 9 +#define LAYOUT_LITTLEROOT_TOWN 10 +#define LAYOUT_OLDALE_TOWN 11 +#define LAYOUT_DEWFORD_TOWN 12 +#define LAYOUT_LAVARIDGE_TOWN 13 +#define LAYOUT_FALLARBOR_TOWN 14 +#define LAYOUT_VERDANTURF_TOWN 15 +#define LAYOUT_PACIFIDLOG_TOWN 16 +#define LAYOUT_ROUTE101 17 +#define LAYOUT_ROUTE102 18 +#define LAYOUT_ROUTE103 19 +#define LAYOUT_ROUTE104 20 +#define LAYOUT_ROUTE105 21 +#define LAYOUT_ROUTE106 22 +#define LAYOUT_ROUTE107 23 +#define LAYOUT_ROUTE108 24 +#define LAYOUT_ROUTE109 25 +#define LAYOUT_ROUTE110 26 +#define LAYOUT_ROUTE111 27 +#define LAYOUT_ROUTE112 28 +#define LAYOUT_ROUTE113 29 +#define LAYOUT_ROUTE114 30 +#define LAYOUT_ROUTE115 31 +#define LAYOUT_ROUTE116 32 +#define LAYOUT_ROUTE117 33 +#define LAYOUT_ROUTE118 34 +#define LAYOUT_ROUTE119 35 +#define LAYOUT_ROUTE120 36 +#define LAYOUT_ROUTE121 37 +#define LAYOUT_ROUTE122 38 +#define LAYOUT_ROUTE123 39 +#define LAYOUT_ROUTE124 40 +#define LAYOUT_ROUTE125 41 +#define LAYOUT_ROUTE126 42 +#define LAYOUT_ROUTE127 43 +#define LAYOUT_ROUTE128 44 +#define LAYOUT_ROUTE129 45 +#define LAYOUT_UNKNOWN_MAP_08417FC4 46 +#define LAYOUT_ROUTE131 47 +#define LAYOUT_ROUTE132 48 +#define LAYOUT_ROUTE133 49 +#define LAYOUT_ROUTE134 50 +#define LAYOUT_UNDERWATER2 51 +#define LAYOUT_UNDERWATER3 52 +#define LAYOUT_UNDERWATER4 53 +#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54 +#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55 +#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56 +#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 57 +#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB 58 +#define LAYOUT_HOUSE1 59 +#define LAYOUT_HOUSE2 60 +#define LAYOUT_POKEMON_CENTER_1F 61 +#define LAYOUT_POKEMON_CENTER_2F 62 +#define LAYOUT_MART 63 +#define LAYOUT_HOUSE3 64 +#define LAYOUT_DEWFORD_TOWN_GYM 65 +#define LAYOUT_DEWFORD_TOWN_HALL 66 +#define LAYOUT_HOUSE4 67 +#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 68 +#define LAYOUT_LAVARIDGE_TOWN_GYM_1F 69 +#define LAYOUT_LAVARIDGE_TOWN_GYM_B1F 70 +#define LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F 71 +#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72 +#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73 +#define LAYOUT_LILYCOVE_CITY_HOUSE2 74 +#define LAYOUT_UNKNOWN_MAP_08428450 75 +#define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76 +#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77 +#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78 +#define LAYOUT_PETALBURG_CITY_GYM 79 +#define LAYOUT_HOUSE_WITH_BED 80 +#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81 +#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82 +#define LAYOUT_UNKNOWN_MAP_084294C4 83 +#define LAYOUT_UNKNOWN_MAP_084294E8 84 +#define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85 +#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86 +#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87 +#define LAYOUT_HARBOR 88 +#define LAYOUT_MAUVILLE_CITY_GYM 89 +#define LAYOUT_MAUVILLE_CITY_BIKE_SHOP 90 +#define LAYOUT_MAUVILLE_CITY_GAME_CORNER 91 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F 92 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F 93 +#define LAYOUT_RUSTBORO_CITY_GYM 94 +#define LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL 95 +#define LAYOUT_RUSTBORO_CITY_HOUSE 96 +#define LAYOUT_RUSTBORO_CITY_HOUSE1 97 +#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 98 +#define LAYOUT_FORTREE_CITY_HOUSE1 99 +#define LAYOUT_FORTREE_CITY_GYM 100 +#define LAYOUT_FORTREE_CITY_HOUSE2 101 +#define LAYOUT_ROUTE104_MR_BRINEYS_HOUSE 102 +#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F 103 +#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F 104 +#define LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY 105 +#define LAYOUT_LILYCOVE_CITY_CONTEST_HALL 106 +#define LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB 107 +#define LAYOUT_MOSSDEEP_CITY_GYM 108 +#define LAYOUT_SOOTOPOLIS_CITY_GYM_1F 109 +#define LAYOUT_SOOTOPOLIS_CITY_GYM_B1F 110 +#define LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM 111 +#define LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM 112 +#define LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM 113 +#define LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM 114 +#define LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM 115 +#define LAYOUT_EVER_GRANDE_CITY_SHORT_HALL 116 +#define LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP 117 +#define LAYOUT_CABLE_CAR_STATION 118 +#define LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE 119 +#define LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL 120 +#define LAYOUT_ROUTE114_LANETTES_HOUSE 121 +#define LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE 122 +#define LAYOUT_ROUTE117_POKEMON_DAY_CARE 123 +#define LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE 124 +#define LAYOUT_METEOR_FALLS_1F_1R 125 +#define LAYOUT_METEOR_FALLS_1F_2R 126 +#define LAYOUT_METEOR_FALLS_B1F_1R 127 +#define LAYOUT_METEOR_FALLS_B1F_2R 128 +#define LAYOUT_RUSTURF_TUNNEL 129 +#define LAYOUT_UNDERWATER_SOOTOPOLIS_CITY 130 +#define LAYOUT_DESERT_RUINS 131 +#define LAYOUT_GRANITE_CAVE_1F 132 +#define LAYOUT_GRANITE_CAVE_B1F 133 +#define LAYOUT_GRANITE_CAVE_B2F 134 +#define LAYOUT_PETALBURG_WOODS 135 +#define LAYOUT_MT_CHIMNEY 136 +#define LAYOUT_MT_PYRE_1F 137 +#define LAYOUT_MT_PYRE_2F 138 +#define LAYOUT_MT_PYRE_3F 139 +#define LAYOUT_MT_PYRE_4F 140 +#define LAYOUT_MT_PYRE_5F 141 +#define LAYOUT_MT_PYRE_6F 142 +#define LAYOUT_AQUA_HIDEOUT_1F 143 +#define LAYOUT_AQUA_HIDEOUT_B1F 144 +#define LAYOUT_AQUA_HIDEOUT_B2F 145 +#define LAYOUT_UNDERWATER_SEAFLOOR_CAVERN 146 +#define LAYOUT_SEAFLOOR_CAVERN_ENTRANCE 147 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM1 148 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM2 149 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM3 150 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM4 151 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM5 152 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM6 153 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM7 154 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM8 155 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM9 156 +#define LAYOUT_CAVE_OF_ORIGIN_ENTRANCE 157 +#define LAYOUT_CAVE_OF_ORIGIN_1F 158 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 159 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 160 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 161 +#define LAYOUT_CAVE_OF_ORIGIN_B1F 162 +#define LAYOUT_VICTORY_ROAD_1F 163 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM 164 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM 165 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM 166 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167 +#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168 +#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169 +#define LAYOUT_UNKNOWN_MAP_0843E6C0 170 +#define LAYOUT_UNKNOWN_MAP_0843E6E4 171 +#define LAYOUT_UNKNOWN_MAP_0843E708 172 +#define LAYOUT_UNKNOWN_MAP_0843E72C 173 +#define LAYOUT_UNKNOWN_MAP_0843E750 174 +#define LAYOUT_UNKNOWN_MAP_0843E774 175 +#define LAYOUT_UNKNOWN_MAP_0843E798 176 +#define LAYOUT_UNKNOWN_MAP_0843E7BC 177 +#define LAYOUT_UNKNOWN_MAP_0843E7E0 178 +#define LAYOUT_UNKNOWN_MAP_0843E804 179 +#define LAYOUT_UNKNOWN_MAP_0843E828 180 +#define LAYOUT_UNKNOWN_MAP_0843E84C 181 +#define LAYOUT_UNKNOWN_MAP_0843E870 182 +#define LAYOUT_UNKNOWN_MAP_0843E894 183 +#define LAYOUT_NEW_MAUVILLE_ENTRANCE 184 +#define LAYOUT_NEW_MAUVILLE_INSIDE 185 +#define LAYOUT_ABANDONED_SHIP_DECK 186 +#define LAYOUT_ABANDONED_SHIP_CORRIDORS_1F 187 +#define LAYOUT_ABANDONED_SHIP_ROOMS_1F 188 +#define LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F 189 +#define LAYOUT_ABANDONED_SHIP_ROOMS_B1F 190 +#define LAYOUT_ABANDONED_SHIP_ROOMS2_B1F 191 +#define LAYOUT_ABANDONED_SHIP_UNDERWATER1 192 +#define LAYOUT_ABANDONED_SHIP_ROOM_B1F 193 +#define LAYOUT_ABANDONED_SHIP_ROOMS2_1F 194 +#define LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE 195 +#define LAYOUT_ABANDONED_SHIP_UNDERWATER2 196 +#define LAYOUT_SECRET_BASE_RED_CAVE1 197 +#define LAYOUT_SECRET_BASE_BROWN_CAVE1 198 +#define LAYOUT_SECRET_BASE_BLUE_CAVE1 199 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE1 200 +#define LAYOUT_SECRET_BASE_TREE1 201 +#define LAYOUT_SECRET_BASE_SHRUB1 202 +#define LAYOUT_SECRET_BASE_RED_CAVE2 203 +#define LAYOUT_SECRET_BASE_BROWN_CAVE2 204 +#define LAYOUT_SECRET_BASE_BLUE_CAVE2 205 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE2 206 +#define LAYOUT_SECRET_BASE_TREE2 207 +#define LAYOUT_SECRET_BASE_SHRUB2 208 +#define LAYOUT_SECRET_BASE_RED_CAVE3 209 +#define LAYOUT_SECRET_BASE_BROWN_CAVE3 210 +#define LAYOUT_SECRET_BASE_BLUE_CAVE3 211 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE3 212 +#define LAYOUT_SECRET_BASE_TREE3 213 +#define LAYOUT_SECRET_BASE_SHRUB3 214 +#define LAYOUT_SECRET_BASE_RED_CAVE4 215 +#define LAYOUT_SECRET_BASE_BROWN_CAVE4 216 +#define LAYOUT_SECRET_BASE_BLUE_CAVE4 217 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218 +#define LAYOUT_SECRET_BASE_TREE4 219 +#define LAYOUT_SECRET_BASE_SHRUB4 220 +#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221 +#define LAYOUT_TRADE_CENTER 222 +#define LAYOUT_RECORD_CORNER 223 +#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224 +#define LAYOUT_LINK_CONTEST_ROOM1 225 +#define LAYOUT_UNKNOWN_MAP_25_29 226 +#define LAYOUT_UNKNOWN_MAP_25_30 227 +#define LAYOUT_UNKNOWN_MAP_25_31 228 +#define LAYOUT_UNKNOWN_MAP_25_32 229 +#define LAYOUT_UNKNOWN_MAP_25_33 230 +#define LAYOUT_UNKNOWN_MAP_25_34 231 +#define LAYOUT_LINK_CONTEST_ROOM2 232 +#define LAYOUT_LINK_CONTEST_ROOM3 233 +#define LAYOUT_LINK_CONTEST_ROOM4 234 +#define LAYOUT_LINK_CONTEST_ROOM5 235 +#define LAYOUT_LINK_CONTEST_ROOM6 236 +#define LAYOUT_INSIDE_OF_TRUCK 237 +#define LAYOUT_SAFARI_ZONE_NORTHWEST 238 +#define LAYOUT_SAFARI_ZONE_NORTH 239 +#define LAYOUT_SAFARI_ZONE_SOUTHWEST 240 +#define LAYOUT_SAFARI_ZONE_SOUTH 241 +#define LAYOUT_UNKNOWN_MAP_08447028 242 +#define LAYOUT_ROUTE109_SEASHORE_HOUSE 243 +#define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244 +#define LAYOUT_ROUTE110_TRICK_HOUSE_END 245 +#define LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR 246 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 247 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 248 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 249 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 250 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 251 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 252 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 253 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 254 +#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 255 +#define LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE 256 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F 257 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F 258 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F 259 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F 260 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F 261 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP 262 +#define LAYOUT_ROUTE130 263 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY 264 +#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST 265 +#define LAYOUT_BATTLE_ELEVATOR 266 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR 267 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM 268 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F 269 +#define LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F 270 +#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271 +#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273 +#define LAYOUT_UNDERWATER1 274 +#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275 +#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276 +#define LAYOUT_SS_TIDAL_CORRIDOR 277 +#define LAYOUT_SS_TIDAL_LOWER_DECK 278 +#define LAYOUT_SS_TIDAL_ROOMS 279 +#define LAYOUT_ISLAND_CAVE 280 +#define LAYOUT_ANCIENT_TOMB 281 +#define LAYOUT_UNDERWATER_ROUTE134 282 +#define LAYOUT_UNDERWATER_SEALED_CHAMBER 283 +#define LAYOUT_SEALED_CHAMBER_OUTER_ROOM 284 +#define LAYOUT_VICTORY_ROAD_B1F 285 +#define LAYOUT_VICTORY_ROAD_B2F 286 +#define LAYOUT_ROUTE104_PROTOTYPE 287 +#define LAYOUT_GRANITE_CAVE_STEVENS_ROOM 288 +#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 289 +#define LAYOUT_SOUTHERN_ISLAND_EXTERIOR 290 +#define LAYOUT_SOUTHERN_ISLAND_INTERIOR 291 +#define LAYOUT_JAGGED_PASS 292 +#define LAYOUT_FIERY_PATH 293 +#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 294 +#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 295 +#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 296 +#define LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE 297 +#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 298 +#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F 299 +#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F 300 +#define LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE 301 +#define LAYOUT_MT_PYRE_EXTERIOR 302 +#define LAYOUT_MT_PYRE_SUMMIT 303 +#define LAYOUT_SEALED_CHAMBER_INNER_ROOM 304 +#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F 305 +#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F 306 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 307 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 308 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309 +#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310 +#define LAYOUT_SCORCHED_SLAB 311 +#define LAYOUT_UNKNOWN_MAP_0845A394 312 +#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313 +#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314 +#define LAYOUT_EVER_GRANDE_CITY_HALL4 315 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318 +#define LAYOUT_UNKNOWN_MAP_0845D470 319 +#define LAYOUT_SKY_PILLAR_ENTRANCE 320 +#define LAYOUT_SKY_PILLAR_OUTSIDE 321 +#define LAYOUT_SKY_PILLAR_1F 322 +#define LAYOUT_SKY_PILLAR_2F 323 +#define LAYOUT_SKY_PILLAR_3F 324 +#define LAYOUT_SKY_PILLAR_4F 325 +#define LAYOUT_UNKNOWN_MAP_0845ECB4 326 +#define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328 +#define LAYOUT_SAFARI_ZONE_REST_HOUSE 329 +#define LAYOUT_SKY_PILLAR_5F 330 +#define LAYOUT_SKY_PILLAR_TOP 331 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY 332 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR 333 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM 334 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM 335 +#define LAYOUT_MAGMA_HIDEOUT_1F 336 +#define LAYOUT_MAGMA_HIDEOUT_2F_1R 337 +#define LAYOUT_MAGMA_HIDEOUT_2F_2R 338 +#define LAYOUT_MAGMA_HIDEOUT_3F_1R 339 +#define LAYOUT_MAGMA_HIDEOUT_3F_2R 340 +#define LAYOUT_MAGMA_HIDEOUT_4F 341 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY 342 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR 343 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM 344 +#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST 345 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY 346 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM 347 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM 348 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY 349 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR 350 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM 351 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 352 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 353 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356 +#define LAYOUT_UNKNOWN_MAP_08469200 357 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358 +#define LAYOUT_UNKNOWN_MAP_084693AC 359 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 +#define LAYOUT_BATTLE_PYRAMID_SQUARE01 362 +#define LAYOUT_BATTLE_PYRAMID_SQUARE02 363 +#define LAYOUT_BATTLE_PYRAMID_SQUARE03 364 +#define LAYOUT_BATTLE_PYRAMID_SQUARE04 365 +#define LAYOUT_BATTLE_PYRAMID_SQUARE05 366 +#define LAYOUT_BATTLE_PYRAMID_SQUARE06 367 +#define LAYOUT_BATTLE_PYRAMID_SQUARE07 368 +#define LAYOUT_BATTLE_PYRAMID_SQUARE08 369 +#define LAYOUT_BATTLE_PYRAMID_SQUARE09 370 +#define LAYOUT_BATTLE_PYRAMID_SQUARE10 371 +#define LAYOUT_BATTLE_PYRAMID_SQUARE11 372 +#define LAYOUT_BATTLE_PYRAMID_SQUARE12 373 +#define LAYOUT_BATTLE_PYRAMID_SQUARE13 374 +#define LAYOUT_BATTLE_PYRAMID_SQUARE14 375 +#define LAYOUT_BATTLE_PYRAMID_SQUARE15 376 +#define LAYOUT_BATTLE_PYRAMID_SQUARE16 377 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP 378 +#define LAYOUT_MAGMA_HIDEOUT_3F_3R 379 +#define LAYOUT_MAGMA_HIDEOUT_2F_3R 380 +#define LAYOUT_MIRAGE_TOWER_1F 381 +#define LAYOUT_MIRAGE_TOWER_2F 382 +#define LAYOUT_MIRAGE_TOWER_3F 383 +#define LAYOUT_BATTLE_TENT_LOBBY 384 +#define LAYOUT_BATTLE_TENT_CORRIDOR 385 +#define LAYOUT_BATTLE_TENT_BATTLE_ROOM 386 +#define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387 +#define LAYOUT_MIRAGE_TOWER_4F 388 +#define LAYOUT_DESERT_UNDERPASS 389 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM 390 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 391 +#define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392 +#define LAYOUT_UNION_ROOM 393 +#define LAYOUT_SAFARI_ZONE_NORTHEAST 394 +#define LAYOUT_SAFARI_ZONE_SOUTHEAST 395 +#define LAYOUT_BATTLE_FRONTIER_RANKING_HALL 396 +#define LAYOUT_BATTLE_FRONTIER_LOUNGE1 397 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER 398 +#define LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE 399 +#define LAYOUT_ARTISAN_CAVE_B1F 400 +#define LAYOUT_ARTISAN_CAVE_1F 401 +#define LAYOUT_FARAWAY_ISLAND_ENTRANCE 402 +#define LAYOUT_FARAWAY_ISLAND_INTERIOR 403 +#define LAYOUT_BIRTH_ISLAND_EXTERIOR 404 +#define LAYOUT_ISLAND_HARBOR 405 +#define LAYOUT_UNDERWATER_MARINE_CAVE 406 +#define LAYOUT_MARINE_CAVE_ENTRANCE 407 +#define LAYOUT_TERRA_CAVE_ENTRANCE 408 +#define LAYOUT_TERRA_CAVE_END 409 +#define LAYOUT_UNDERWATER6 410 +#define LAYOUT_UNDERWATER7 411 +#define LAYOUT_UNDERWATER5 412 +#define LAYOUT_MARINE_CAVE_END 413 +#define LAYOUT_TRAINER_HILL_ENTRANCE 414 +#define LAYOUT_TRAINER_HILL_1F 415 +#define LAYOUT_TRAINER_HILL_2F 416 +#define LAYOUT_TRAINER_HILL_3F 417 +#define LAYOUT_TRAINER_HILL_4F 418 +#define LAYOUT_TRAINER_HILL_ROOF 419 +#define LAYOUT_ALTERING_CAVE 420 +#define LAYOUT_NAVEL_ROCK_EXTERIOR 421 +#define LAYOUT_NAVEL_ROCK_ENTRANCE 422 +#define LAYOUT_NAVEL_ROCK_TOP 423 +#define LAYOUT_NAVEL_ROCK_BOTTOM 424 +#define LAYOUT_NAVEL_ROCK_LADDER_ROOM1 425 +#define LAYOUT_NAVEL_ROCK_LADDER_ROOM2 426 +#define LAYOUT_NAVEL_ROCK_B1F 427 +#define LAYOUT_NAVEL_ROCK_FORK 428 +#define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429 +#define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430 +#define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431 +#define LAYOUT_UNKNOWN_MAP_08480DAC 432 +#define LAYOUT_UNKNOWN_MAP_08480F54 433 +#define LAYOUT_UNKNOWN_MAP_084810FC 434 +#define LAYOUT_UNKNOWN_MAP_084812A4 435 +#define LAYOUT_UNKNOWN_MAP_0848144C 436 +#define LAYOUT_UNKNOWN_MAP_084815F4 437 +#define LAYOUT_UNKNOWN_MAP_08481B24 438 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 +#define LAYOUT_UNKNOWN_MAP_08481DBC 441 + +#endif // GUARD_CONSTANTS_LAYOUTS_H From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: [PATCH 22/42] Convert map data to JSON --- Makefile | 6 + data/event_scripts.s | 1 + data/layouts.inc | 441 -- data/layouts/.gitignore | 2 + .../AbandonedShip_CaptainsOffice/layout.inc | 15 - .../AbandonedShip_Corridors_1F/layout.inc | 15 - .../AbandonedShip_Corridors_B1F/layout.inc | 15 - data/layouts/AbandonedShip_Deck/layout.inc | 15 - .../layout.inc | 15 - .../AbandonedShip_HiddenFloorRooms/layout.inc | 15 - .../layouts/AbandonedShip_Room_B1F/layout.inc | 15 - .../AbandonedShip_Rooms2_1F/layout.inc | 15 - .../AbandonedShip_Rooms2_B1F/layout.inc | 15 - .../layouts/AbandonedShip_Rooms_1F/layout.inc | 15 - .../AbandonedShip_Rooms_B1F/layout.inc | 15 - .../AbandonedShip_Underwater1/layout.inc | 15 - .../AbandonedShip_Underwater2/layout.inc | 15 - data/layouts/AlteringCave/layout.inc | 15 - data/layouts/AncientTomb/layout.inc | 15 - data/layouts/AquaHideout_1F/layout.inc | 15 - data/layouts/AquaHideout_B1F/layout.inc | 15 - data/layouts/AquaHideout_B2F/layout.inc | 15 - .../AquaHideout_UnusedRubyMap1/layout.inc | 15 - .../AquaHideout_UnusedRubyMap2/layout.inc | 15 - .../AquaHideout_UnusedRubyMap3/layout.inc | 15 - data/layouts/ArtisanCave_1F/layout.inc | 15 - data/layouts/ArtisanCave_B1F/layout.inc | 15 - data/layouts/BattleElevator/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattleDomeLobby/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattlePikeLobby/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layouts/BattleFrontier_Lounge1/layout.inc | 15 - .../layouts/BattleFrontier_Lounge2/layout.inc | 15 - .../BattleFrontier_OutsideEast/layout.inc | 15 - .../BattleFrontier_OutsideWest/layout.inc | 15 - .../BattleFrontier_RankingHall/layout.inc | 15 - .../BattleFrontier_ReceptionGate/layout.inc | 15 - .../BattleFrontier_ScottsHouse/layout.inc | 15 - data/layouts/BattlePyramidSquare01/layout.inc | 15 - data/layouts/BattlePyramidSquare02/layout.inc | 15 - data/layouts/BattlePyramidSquare03/layout.inc | 15 - data/layouts/BattlePyramidSquare04/layout.inc | 15 - data/layouts/BattlePyramidSquare05/layout.inc | 15 - data/layouts/BattlePyramidSquare06/layout.inc | 15 - data/layouts/BattlePyramidSquare07/layout.inc | 15 - data/layouts/BattlePyramidSquare08/layout.inc | 15 - data/layouts/BattlePyramidSquare09/layout.inc | 15 - data/layouts/BattlePyramidSquare10/layout.inc | 15 - data/layouts/BattlePyramidSquare11/layout.inc | 15 - data/layouts/BattlePyramidSquare12/layout.inc | 15 - data/layouts/BattlePyramidSquare13/layout.inc | 15 - data/layouts/BattlePyramidSquare14/layout.inc | 15 - data/layouts/BattlePyramidSquare15/layout.inc | 15 - data/layouts/BattlePyramidSquare16/layout.inc | 15 - data/layouts/BattleTentBattleRoom/layout.inc | 15 - data/layouts/BattleTentCorridor/layout.inc | 15 - data/layouts/BattleTentLobby/layout.inc | 15 - data/layouts/BirthIsland_Exterior/layout.inc | 15 - data/layouts/CableCarStation/layout.inc | 15 - data/layouts/CaveOfOrigin_1F/layout.inc | 15 - data/layouts/CaveOfOrigin_B1F/layout.inc | 15 - data/layouts/CaveOfOrigin_Entrance/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - data/layouts/DesertRuins/layout.inc | 15 - data/layouts/DesertUnderpass/layout.inc | 15 - data/layouts/DewfordTown/layout.inc | 15 - data/layouts/DewfordTown_Gym/layout.inc | 15 - data/layouts/DewfordTown_Hall/layout.inc | 15 - data/layouts/DoubleBattleColosseum/layout.inc | 15 - data/layouts/EverGrandeCity/layout.inc | 15 - .../EverGrandeCity_ChampionsRoom/layout.inc | 15 - .../EverGrandeCity_DrakesRoom/layout.inc | 15 - .../EverGrandeCity_GlaciasRoom/layout.inc | 15 - data/layouts/EverGrandeCity_Hall4/layout.inc | 15 - .../EverGrandeCity_HallOfFame/layout.inc | 15 - .../EverGrandeCity_PhoebesRoom/layout.inc | 15 - .../layout.inc | 15 - .../EverGrandeCity_ShortHall/layout.inc | 15 - .../EverGrandeCity_SidneysRoom/layout.inc | 15 - data/layouts/FallarborTown/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layouts/FarawayIsland_Entrance/layout.inc | 15 - .../layouts/FarawayIsland_Interior/layout.inc | 15 - data/layouts/FieryPath/layout.inc | 15 - data/layouts/FortreeCity/layout.inc | 15 - .../FortreeCity_DecorationShop/layout.inc | 15 - data/layouts/FortreeCity_Gym/layout.inc | 15 - data/layouts/FortreeCity_House1/layout.inc | 15 - data/layouts/FortreeCity_House2/layout.inc | 15 - data/layouts/GraniteCave_1F/layout.inc | 15 - data/layouts/GraniteCave_B1F/layout.inc | 15 - data/layouts/GraniteCave_B2F/layout.inc | 15 - .../GraniteCave_StevensRoom/layout.inc | 15 - data/layouts/Harbor/layout.inc | 15 - data/layouts/House1/layout.inc | 15 - data/layouts/House2/layout.inc | 15 - data/layouts/House3/layout.inc | 15 - data/layouts/House4/layout.inc | 15 - data/layouts/HouseWithBed/layout.inc | 15 - data/layouts/InsideOfTruck/layout.inc | 15 - data/layouts/IslandCave/layout.inc | 15 - data/layouts/IslandHarbor/layout.inc | 15 - data/layouts/JaggedPass/layout.inc | 15 - data/layouts/LavaridgeTown/layout.inc | 15 - data/layouts/LavaridgeTown_Gym_1F/layout.inc | 15 - data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 15 - .../layouts/LavaridgeTown_HerbShop/layout.inc | 15 - .../LavaridgeTown_PokemonCenter_1F/layout.inc | 15 - data/layouts/LilycoveCity/layout.inc | 15 - .../LilycoveCity_ContestHall/layout.inc | 15 - .../LilycoveCity_ContestLobby/layout.inc | 15 - .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 15 - .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - data/layouts/LilycoveCity_House2/layout.inc | 15 - .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 15 - .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 15 - .../layout.inc | 15 - data/layouts/LinkContestRoom1/layout.inc | 15 - data/layouts/LinkContestRoom2/layout.inc | 15 - data/layouts/LinkContestRoom3/layout.inc | 15 - data/layouts/LinkContestRoom4/layout.inc | 15 - data/layouts/LinkContestRoom5/layout.inc | 15 - data/layouts/LinkContestRoom6/layout.inc | 15 - data/layouts/LittlerootTown/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../LittlerootTown_MaysHouse_1F/layout.inc | 15 - .../LittlerootTown_MaysHouse_2F/layout.inc | 15 - .../layout.inc | 15 - data/layouts/MagmaHideout_1F/layout.inc | 15 - data/layouts/MagmaHideout_2F_1R/layout.inc | 15 - data/layouts/MagmaHideout_2F_2R/layout.inc | 15 - data/layouts/MagmaHideout_2F_3R/layout.inc | 15 - data/layouts/MagmaHideout_3F_1R/layout.inc | 15 - data/layouts/MagmaHideout_3F_2R/layout.inc | 15 - data/layouts/MagmaHideout_3F_3R/layout.inc | 15 - data/layouts/MagmaHideout_4F/layout.inc | 15 - data/layouts/MarineCave_End/layout.inc | 15 - data/layouts/MarineCave_Entrance/layout.inc | 15 - data/layouts/Mart/layout.inc | 15 - data/layouts/MauvilleCity/layout.inc | 15 - data/layouts/MauvilleCity_BikeShop/layout.inc | 15 - .../MauvilleCity_GameCorner/layout.inc | 15 - data/layouts/MauvilleCity_Gym/layout.inc | 15 - data/layouts/MeteorFalls_1F_1R/layout.inc | 15 - data/layouts/MeteorFalls_1F_2R/layout.inc | 15 - data/layouts/MeteorFalls_B1F_1R/layout.inc | 15 - data/layouts/MeteorFalls_B1F_2R/layout.inc | 15 - .../MeteorFalls_StevensCave/layout.inc | 15 - data/layouts/MirageTower_1F/layout.inc | 15 - data/layouts/MirageTower_2F/layout.inc | 15 - data/layouts/MirageTower_3F/layout.inc | 15 - data/layouts/MirageTower_4F/layout.inc | 15 - data/layouts/MossdeepCity/layout.inc | 15 - .../MossdeepCity_GameCorner_1F/layout.inc | 15 - .../MossdeepCity_GameCorner_B1F/layout.inc | 15 - data/layouts/MossdeepCity_Gym/layout.inc | 15 - .../MossdeepCity_SpaceCenter_1F/layout.inc | 15 - .../MossdeepCity_SpaceCenter_2F/layout.inc | 15 - .../MossdeepCity_StevensHouse/layout.inc | 15 - data/layouts/MtChimney/layout.inc | 15 - data/layouts/MtPyre_1F/layout.inc | 15 - data/layouts/MtPyre_2F/layout.inc | 15 - data/layouts/MtPyre_3F/layout.inc | 15 - data/layouts/MtPyre_4F/layout.inc | 15 - data/layouts/MtPyre_5F/layout.inc | 15 - data/layouts/MtPyre_6F/layout.inc | 15 - data/layouts/MtPyre_Exterior/layout.inc | 15 - data/layouts/MtPyre_Summit/layout.inc | 15 - data/layouts/NavelRock_B1F/layout.inc | 15 - data/layouts/NavelRock_Bottom/layout.inc | 15 - data/layouts/NavelRock_Entrance/layout.inc | 15 - data/layouts/NavelRock_Exterior/layout.inc | 15 - data/layouts/NavelRock_Fork/layout.inc | 15 - data/layouts/NavelRock_LadderRoom1/layout.inc | 15 - data/layouts/NavelRock_LadderRoom2/layout.inc | 15 - data/layouts/NavelRock_Top/layout.inc | 15 - data/layouts/NewMauville_Entrance/layout.inc | 15 - data/layouts/NewMauville_Inside/layout.inc | 15 - data/layouts/OldaleTown/layout.inc | 15 - data/layouts/PacifidlogTown/layout.inc | 15 - data/layouts/PacifidlogTown_House1/layout.inc | 15 - data/layouts/PacifidlogTown_House2/layout.inc | 15 - data/layouts/PetalburgCity/layout.inc | 15 - data/layouts/PetalburgCity_Gym/layout.inc | 15 - data/layouts/PetalburgWoods/layout.inc | 15 - data/layouts/PokemonCenter_1F/layout.inc | 15 - data/layouts/PokemonCenter_2F/layout.inc | 15 - data/layouts/RecordCorner/layout.inc | 15 - data/layouts/Route101/layout.inc | 15 - data/layouts/Route102/layout.inc | 15 - data/layouts/Route103/layout.inc | 15 - data/layouts/Route104/layout.inc | 15 - .../Route104_MrBrineysHouse/layout.inc | 15 - .../Route104_PrettyPetalFlowerShop/layout.inc | 15 - data/layouts/Route104_Prototype/layout.inc | 15 - data/layouts/Route105/layout.inc | 15 - data/layouts/Route106/layout.inc | 15 - data/layouts/Route107/layout.inc | 15 - data/layouts/Route108/layout.inc | 15 - data/layouts/Route109/layout.inc | 15 - .../layouts/Route109_SeashoreHouse/layout.inc | 15 - data/layouts/Route110/layout.inc | 15 - .../layout.inc | 15 - .../Route110_TrickHouseCorridor/layout.inc | 15 - .../layouts/Route110_TrickHouseEnd/layout.inc | 15 - .../Route110_TrickHouseEntrance/layout.inc | 15 - .../Route110_TrickHousePuzzle1/layout.inc | 15 - .../Route110_TrickHousePuzzle2/layout.inc | 15 - .../Route110_TrickHousePuzzle3/layout.inc | 15 - .../Route110_TrickHousePuzzle4/layout.inc | 15 - .../Route110_TrickHousePuzzle5/layout.inc | 15 - .../Route110_TrickHousePuzzle6/layout.inc | 15 - .../Route110_TrickHousePuzzle7/layout.inc | 15 - .../Route110_TrickHousePuzzle8/layout.inc | 15 - data/layouts/Route111/layout.inc | 15 - .../layouts/Route111_NoMirageTower/layout.inc | 15 - data/layouts/Route112/layout.inc | 15 - data/layouts/Route113/layout.inc | 15 - data/layouts/Route114/layout.inc | 15 - .../Route114_FossilManiacsHouse/layout.inc | 15 - .../Route114_FossilManiacsTunnel/layout.inc | 15 - .../layouts/Route114_LanettesHouse/layout.inc | 15 - data/layouts/Route115/layout.inc | 15 - data/layouts/Route116/layout.inc | 15 - .../Route116_TunnelersRestHouse/layout.inc | 15 - data/layouts/Route117/layout.inc | 15 - .../Route117_PokemonDayCare/layout.inc | 15 - data/layouts/Route118/layout.inc | 15 - data/layouts/Route119/layout.inc | 15 - .../Route119_WeatherInstitute_1F/layout.inc | 15 - .../Route119_WeatherInstitute_2F/layout.inc | 15 - data/layouts/Route120/layout.inc | 15 - data/layouts/Route121/layout.inc | 15 - .../Route121_SafariZoneEntrance/layout.inc | 15 - data/layouts/Route122/layout.inc | 15 - data/layouts/Route123/layout.inc | 15 - data/layouts/Route124/layout.inc | 15 - .../layout.inc | 15 - data/layouts/Route125/layout.inc | 15 - data/layouts/Route126/layout.inc | 15 - data/layouts/Route127/layout.inc | 15 - data/layouts/Route128/layout.inc | 15 - data/layouts/Route129/layout.inc | 15 - data/layouts/Route130/layout.inc | 15 - data/layouts/Route131/layout.inc | 15 - data/layouts/Route132/layout.inc | 15 - data/layouts/Route133/layout.inc | 15 - data/layouts/Route134/layout.inc | 15 - data/layouts/RustboroCity/layout.inc | 15 - .../RustboroCity_CuttersHouse/layout.inc | 15 - .../RustboroCity_DevonCorp_1F/layout.inc | 15 - .../RustboroCity_DevonCorp_2F/layout.inc | 15 - .../RustboroCity_DevonCorp_3F/layout.inc | 15 - data/layouts/RustboroCity_Flat1_1F/layout.inc | 15 - data/layouts/RustboroCity_Flat1_2F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_1F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_2F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_3F/layout.inc | 15 - data/layouts/RustboroCity_Gym/layout.inc | 15 - data/layouts/RustboroCity_House/layout.inc | 15 - data/layouts/RustboroCity_House1/layout.inc | 15 - .../RustboroCity_PokemonSchool/layout.inc | 15 - data/layouts/RusturfTunnel/layout.inc | 15 - data/layouts/SSTidalCorridor/layout.inc | 15 - data/layouts/SSTidalLowerDeck/layout.inc | 15 - data/layouts/SSTidalRooms/layout.inc | 15 - data/layouts/SafariZone_North/layout.inc | 15 - data/layouts/SafariZone_Northeast/layout.inc | 15 - data/layouts/SafariZone_Northwest/layout.inc | 15 - data/layouts/SafariZone_RestHouse/layout.inc | 15 - data/layouts/SafariZone_South/layout.inc | 15 - data/layouts/SafariZone_Southeast/layout.inc | 15 - data/layouts/SafariZone_Southwest/layout.inc | 15 - data/layouts/ScorchedSlab/layout.inc | 15 - .../SeafloorCavern_Entrance/layout.inc | 15 - data/layouts/SeafloorCavern_Room1/layout.inc | 15 - data/layouts/SeafloorCavern_Room2/layout.inc | 15 - data/layouts/SeafloorCavern_Room3/layout.inc | 15 - data/layouts/SeafloorCavern_Room4/layout.inc | 15 - data/layouts/SeafloorCavern_Room5/layout.inc | 15 - data/layouts/SeafloorCavern_Room6/layout.inc | 15 - data/layouts/SeafloorCavern_Room7/layout.inc | 15 - data/layouts/SeafloorCavern_Room8/layout.inc | 15 - data/layouts/SeafloorCavern_Room9/layout.inc | 15 - .../SealedChamber_InnerRoom/layout.inc | 15 - .../SealedChamber_OuterRoom/layout.inc | 15 - data/layouts/SecretBase_BlueCave1/layout.inc | 15 - data/layouts/SecretBase_BlueCave2/layout.inc | 15 - data/layouts/SecretBase_BlueCave3/layout.inc | 15 - data/layouts/SecretBase_BlueCave4/layout.inc | 15 - data/layouts/SecretBase_BrownCave1/layout.inc | 15 - data/layouts/SecretBase_BrownCave2/layout.inc | 15 - data/layouts/SecretBase_BrownCave3/layout.inc | 15 - data/layouts/SecretBase_BrownCave4/layout.inc | 15 - data/layouts/SecretBase_RedCave1/layout.inc | 15 - data/layouts/SecretBase_RedCave2/layout.inc | 15 - data/layouts/SecretBase_RedCave3/layout.inc | 15 - data/layouts/SecretBase_RedCave4/layout.inc | 15 - data/layouts/SecretBase_Shrub1/layout.inc | 15 - data/layouts/SecretBase_Shrub2/layout.inc | 15 - data/layouts/SecretBase_Shrub3/layout.inc | 15 - data/layouts/SecretBase_Shrub4/layout.inc | 15 - data/layouts/SecretBase_Tree1/layout.inc | 15 - data/layouts/SecretBase_Tree2/layout.inc | 15 - data/layouts/SecretBase_Tree3/layout.inc | 15 - data/layouts/SecretBase_Tree4/layout.inc | 15 - .../layouts/SecretBase_YellowCave1/layout.inc | 15 - .../layouts/SecretBase_YellowCave2/layout.inc | 15 - .../layouts/SecretBase_YellowCave3/layout.inc | 15 - .../layouts/SecretBase_YellowCave4/layout.inc | 15 - .../ShoalCave_HighTideEntranceRoom/layout.inc | 15 - .../ShoalCave_HighTideInnerRoom/layout.inc | 15 - .../ShoalCave_LowTideEntranceRoom/layout.inc | 15 - .../ShoalCave_LowTideIceRoom/layout.inc | 15 - .../ShoalCave_LowTideInnerRoom/layout.inc | 15 - .../ShoalCave_LowTideLowerRoom/layout.inc | 15 - .../ShoalCave_LowTideStairsRoom/layout.inc | 15 - data/layouts/SingleBattleColosseum/layout.inc | 15 - data/layouts/SkyPillar_1F/layout.inc | 15 - data/layouts/SkyPillar_2F/layout.inc | 15 - data/layouts/SkyPillar_3F/layout.inc | 15 - data/layouts/SkyPillar_4F/layout.inc | 15 - data/layouts/SkyPillar_5F/layout.inc | 15 - data/layouts/SkyPillar_Entrance/layout.inc | 15 - data/layouts/SkyPillar_Outside/layout.inc | 15 - data/layouts/SkyPillar_Top/layout.inc | 15 - data/layouts/SlateportCity/layout.inc | 15 - .../SlateportCity_OceanicMuseum_1F/layout.inc | 15 - .../SlateportCity_OceanicMuseum_2F/layout.inc | 15 - .../SlateportCity_PokemonFanClub/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - data/layouts/SootopolisCity/layout.inc | 15 - data/layouts/SootopolisCity_Gym_1F/layout.inc | 15 - .../layouts/SootopolisCity_Gym_B1F/layout.inc | 15 - data/layouts/SootopolisCity_House1/layout.inc | 15 - data/layouts/SootopolisCity_House2/layout.inc | 15 - data/layouts/SootopolisCity_House3/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../SouthernIsland_Exterior/layout.inc | 15 - .../SouthernIsland_Interior/layout.inc | 15 - data/layouts/TerraCave_End/layout.inc | 15 - data/layouts/TerraCave_Entrance/layout.inc | 15 - data/layouts/TradeCenter/layout.inc | 15 - data/layouts/TrainerHill_1F/layout.inc | 15 - data/layouts/TrainerHill_2F/layout.inc | 15 - data/layouts/TrainerHill_3F/layout.inc | 15 - data/layouts/TrainerHill_4F/layout.inc | 15 - data/layouts/TrainerHill_Entrance/layout.inc | 15 - data/layouts/TrainerHill_Roof/layout.inc | 15 - data/layouts/Underwater1/layout.inc | 15 - data/layouts/Underwater2/layout.inc | 15 - data/layouts/Underwater3/layout.inc | 15 - data/layouts/Underwater4/layout.inc | 15 - data/layouts/Underwater5/layout.inc | 15 - data/layouts/Underwater6/layout.inc | 15 - data/layouts/Underwater7/layout.inc | 15 - data/layouts/Underwater_MarineCave/layout.inc | 15 - data/layouts/Underwater_Route134/layout.inc | 15 - .../Underwater_SeafloorCavern/layout.inc | 15 - .../Underwater_SealedChamber/layout.inc | 15 - .../Underwater_SootopolisCity/layout.inc | 15 - data/layouts/UnionRoom/layout.inc | 15 - data/layouts/UnknownMap_08417FC4/layout.inc | 15 - data/layouts/UnknownMap_08428450/layout.inc | 15 - data/layouts/UnknownMap_084294C4/layout.inc | 15 - data/layouts/UnknownMap_084294E8/layout.inc | 15 - data/layouts/UnknownMap_0843E6C0/layout.inc | 15 - data/layouts/UnknownMap_0843E6E4/layout.inc | 15 - data/layouts/UnknownMap_0843E708/layout.inc | 15 - data/layouts/UnknownMap_0843E72C/layout.inc | 15 - data/layouts/UnknownMap_0843E750/layout.inc | 15 - data/layouts/UnknownMap_0843E774/layout.inc | 15 - data/layouts/UnknownMap_0843E798/layout.inc | 15 - data/layouts/UnknownMap_0843E7BC/layout.inc | 15 - data/layouts/UnknownMap_0843E7E0/layout.inc | 15 - data/layouts/UnknownMap_0843E804/layout.inc | 15 - data/layouts/UnknownMap_0843E828/layout.inc | 15 - data/layouts/UnknownMap_0843E84C/layout.inc | 15 - data/layouts/UnknownMap_0843E870/layout.inc | 15 - data/layouts/UnknownMap_0843E894/layout.inc | 15 - data/layouts/UnknownMap_08447028/layout.inc | 15 - data/layouts/UnknownMap_0845A394/layout.inc | 15 - data/layouts/UnknownMap_0845D470/layout.inc | 15 - data/layouts/UnknownMap_0845ECB4/layout.inc | 15 - data/layouts/UnknownMap_08469200/layout.inc | 15 - data/layouts/UnknownMap_084693AC/layout.inc | 15 - data/layouts/UnknownMap_08480DAC/layout.inc | 15 - data/layouts/UnknownMap_08480F54/layout.inc | 15 - data/layouts/UnknownMap_084810FC/layout.inc | 15 - data/layouts/UnknownMap_084812A4/layout.inc | 15 - data/layouts/UnknownMap_0848144C/layout.inc | 15 - data/layouts/UnknownMap_084815F4/layout.inc | 15 - data/layouts/UnknownMap_08481B24/layout.inc | 15 - data/layouts/UnknownMap_08481DBC/layout.inc | 15 - data/layouts/UnknownMap_25_29/layout.inc | 15 - data/layouts/UnknownMap_25_30/layout.inc | 15 - data/layouts/UnknownMap_25_31/layout.inc | 15 - data/layouts/UnknownMap_25_32/layout.inc | 15 - data/layouts/UnknownMap_25_33/layout.inc | 15 - data/layouts/UnknownMap_25_34/layout.inc | 15 - data/layouts/VerdanturfTown/layout.inc | 15 - .../layout.inc | 15 - .../VerdanturfTown_WandasHouse/layout.inc | 15 - data/layouts/VictoryRoad_1F/layout.inc | 15 - data/layouts/VictoryRoad_B1F/layout.inc | 15 - data/layouts/VictoryRoad_B2F/layout.inc | 15 - data/layouts/layouts.json | 4415 +++++++++++++++++ data/layouts_table.inc | 443 -- data/map_events.s | 519 +- data/maps.s | 4 +- data/maps/.gitignore | 7 + .../AbandonedShip_CaptainsOffice/events.inc | 11 - .../AbandonedShip_CaptainsOffice/header.inc | 15 - .../AbandonedShip_CaptainsOffice/map.json | 62 + .../AbandonedShip_Corridors_1F/events.inc | 21 - .../AbandonedShip_Corridors_1F/header.inc | 15 - data/maps/AbandonedShip_Corridors_1F/map.json | 132 + .../AbandonedShip_Corridors_B1F/events.inc | 20 - .../AbandonedShip_Corridors_B1F/header.inc | 15 - .../maps/AbandonedShip_Corridors_B1F/map.json | 113 + data/maps/AbandonedShip_Deck/events.inc | 10 - data/maps/AbandonedShip_Deck/header.inc | 15 - data/maps/AbandonedShip_Deck/map.json | 56 + .../events.inc | 17 - .../header.inc | 15 - .../map.json | 96 + .../AbandonedShip_HiddenFloorRooms/events.inc | 32 - .../AbandonedShip_HiddenFloorRooms/header.inc | 15 - .../AbandonedShip_HiddenFloorRooms/map.json | 218 + data/maps/AbandonedShip_Room_B1F/events.inc | 10 - data/maps/AbandonedShip_Room_B1F/header.inc | 15 - data/maps/AbandonedShip_Room_B1F/map.json | 49 + data/maps/AbandonedShip_Rooms2_1F/events.inc | 15 - data/maps/AbandonedShip_Rooms2_1F/header.inc | 15 - data/maps/AbandonedShip_Rooms2_1F/map.json | 108 + data/maps/AbandonedShip_Rooms2_B1F/events.inc | 13 - data/maps/AbandonedShip_Rooms2_B1F/header.inc | 15 - data/maps/AbandonedShip_Rooms2_B1F/map.json | 76 + data/maps/AbandonedShip_Rooms_1F/events.inc | 17 - data/maps/AbandonedShip_Rooms_1F/header.inc | 15 - data/maps/AbandonedShip_Rooms_1F/map.json | 116 + data/maps/AbandonedShip_Rooms_B1F/events.inc | 12 - data/maps/AbandonedShip_Rooms_B1F/header.inc | 15 - data/maps/AbandonedShip_Rooms_B1F/map.json | 69 + .../maps/AbandonedShip_Underwater1/events.inc | 7 - .../maps/AbandonedShip_Underwater1/header.inc | 15 - data/maps/AbandonedShip_Underwater1/map.json | 35 + .../maps/AbandonedShip_Underwater2/events.inc | 6 - .../maps/AbandonedShip_Underwater2/header.inc | 15 - data/maps/AbandonedShip_Underwater2/map.json | 28 + data/maps/AlteringCave/events.inc | 6 - data/maps/AlteringCave/header.inc | 15 - data/maps/AlteringCave/map.json | 28 + data/maps/AncientTomb/events.inc | 16 - data/maps/AncientTomb/header.inc | 15 - data/maps/AncientTomb/map.json | 81 + data/maps/AquaHideout_1F/events.inc | 13 - data/maps/AquaHideout_1F/header.inc | 15 - data/maps/AquaHideout_1F/map.json | 82 + data/maps/AquaHideout_B1F/events.inc | 41 - data/maps/AquaHideout_B1F/header.inc | 15 - data/maps/AquaHideout_B1F/map.json | 314 ++ data/maps/AquaHideout_B2F/events.inc | 27 - data/maps/AquaHideout_B2F/header.inc | 15 - data/maps/AquaHideout_B2F/map.json | 189 + .../AquaHideout_UnusedRubyMap1/events.inc | 3 - .../AquaHideout_UnusedRubyMap1/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap1/map.json | 20 + .../AquaHideout_UnusedRubyMap2/events.inc | 3 - .../AquaHideout_UnusedRubyMap2/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap2/map.json | 20 + .../AquaHideout_UnusedRubyMap3/events.inc | 3 - .../AquaHideout_UnusedRubyMap3/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap3/map.json | 20 + data/maps/ArtisanCave_1F/events.inc | 10 - data/maps/ArtisanCave_1F/header.inc | 15 - data/maps/ArtisanCave_1F/map.json | 49 + data/maps/ArtisanCave_B1F/events.inc | 16 - data/maps/ArtisanCave_B1F/header.inc | 15 - data/maps/ArtisanCave_B1F/map.json | 82 + .../events.inc | 14 - .../header.inc | 15 - .../map.json | 138 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 17 - .../header.inc | 15 - .../BattleFrontier_BattleArenaLobby/map.json | 111 + .../events.inc | 20 - .../header.inc | 15 - .../map.json | 216 + .../events.inc | 10 - .../header.inc | 15 - .../map.json | 49 + .../BattleFrontier_BattleDomeLobby/events.inc | 21 - .../BattleFrontier_BattleDomeLobby/header.inc | 15 - .../BattleFrontier_BattleDomeLobby/map.json | 147 + .../events.inc | 10 - .../header.inc | 15 - .../map.json | 49 + .../events.inc | 13 - .../header.inc | 15 - .../map.json | 125 + .../events.inc | 20 - .../header.inc | 15 - .../map.json | 139 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 14 - .../header.inc | 15 - .../map.json | 101 + .../events.inc | 18 - .../header.inc | 15 - .../map.json | 141 + .../events.inc | 21 - .../header.inc | 15 - .../BattleFrontier_BattlePalaceLobby/map.json | 146 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../BattleFrontier_BattlePikeLobby/events.inc | 18 - .../BattleFrontier_BattlePikeLobby/header.inc | 15 - .../BattleFrontier_BattlePikeLobby/map.json | 112 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 111 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 12 - .../header.inc | 15 - .../map.json | 84 + .../events.inc | 18 - .../header.inc | 15 - .../map.json | 129 + .../events.inc | 19 - .../header.inc | 15 - .../map.json | 160 + .../events.inc | 21 - .../header.inc | 15 - .../map.json | 229 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 98 + .../events.inc | 10 - .../header.inc | 15 - .../BattleFrontier_BattlePyramidTop/map.json | 57 + .../events.inc | 12 - .../header.inc | 15 - .../map.json | 75 + .../events.inc | 11 - .../header.inc | 15 - .../map.json | 99 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 9 - .../header.inc | 15 - .../map.json | 73 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 26 - .../header.inc | 15 - .../BattleFrontier_BattleTowerLobby/map.json | 201 + .../events.inc | 14 - .../header.inc | 15 - .../map.json | 138 + data/maps/BattleFrontier_Lounge1/events.inc | 11 - data/maps/BattleFrontier_Lounge1/header.inc | 15 - data/maps/BattleFrontier_Lounge1/map.json | 68 + data/maps/BattleFrontier_Lounge2/events.inc | 14 - data/maps/BattleFrontier_Lounge2/header.inc | 15 - data/maps/BattleFrontier_Lounge2/map.json | 101 + data/maps/BattleFrontier_Lounge3/events.inc | 13 - data/maps/BattleFrontier_Lounge3/header.inc | 15 - data/maps/BattleFrontier_Lounge3/map.json | 94 + data/maps/BattleFrontier_Lounge4/events.inc | 11 - data/maps/BattleFrontier_Lounge4/header.inc | 15 - data/maps/BattleFrontier_Lounge4/map.json | 68 + data/maps/BattleFrontier_Lounge5/events.inc | 13 - data/maps/BattleFrontier_Lounge5/header.inc | 15 - data/maps/BattleFrontier_Lounge5/map.json | 88 + data/maps/BattleFrontier_Lounge6/events.inc | 9 - data/maps/BattleFrontier_Lounge6/header.inc | 15 - data/maps/BattleFrontier_Lounge6/map.json | 42 + data/maps/BattleFrontier_Lounge7/events.inc | 12 - data/maps/BattleFrontier_Lounge7/header.inc | 15 - data/maps/BattleFrontier_Lounge7/map.json | 81 + data/maps/BattleFrontier_Lounge8/events.inc | 11 - data/maps/BattleFrontier_Lounge8/header.inc | 15 - data/maps/BattleFrontier_Lounge8/map.json | 68 + data/maps/BattleFrontier_Lounge9/events.inc | 10 - data/maps/BattleFrontier_Lounge9/header.inc | 15 - data/maps/BattleFrontier_Lounge9/map.json | 49 + data/maps/BattleFrontier_Mart/events.inc | 13 - data/maps/BattleFrontier_Mart/header.inc | 15 - data/maps/BattleFrontier_Mart/map.json | 88 + .../connections.inc | 7 - .../BattleFrontier_OutsideEast/events.inc | 57 - .../BattleFrontier_OutsideEast/header.inc | 15 - data/maps/BattleFrontier_OutsideEast/map.json | 529 ++ .../connections.inc | 7 - .../BattleFrontier_OutsideWest/events.inc | 49 - .../BattleFrontier_OutsideWest/header.inc | 15 - data/maps/BattleFrontier_OutsideWest/map.json | 458 ++ .../events.inc | 15 - .../header.inc | 15 - .../BattleFrontier_PokemonCenter_1F/map.json | 108 + .../events.inc | 14 - .../header.inc | 15 - .../BattleFrontier_PokemonCenter_2F/map.json | 95 + .../BattleFrontier_RankingHall/events.inc | 26 - .../BattleFrontier_RankingHall/header.inc | 15 - data/maps/BattleFrontier_RankingHall/map.json | 172 + .../BattleFrontier_ReceptionGate/events.inc | 14 - .../BattleFrontier_ReceptionGate/header.inc | 15 - .../BattleFrontier_ReceptionGate/map.json | 101 + .../BattleFrontier_ScottsHouse/events.inc | 10 - .../BattleFrontier_ScottsHouse/header.inc | 15 - data/maps/BattleFrontier_ScottsHouse/map.json | 49 + data/maps/BattlePyramidSquare01/events.inc | 12 - data/maps/BattlePyramidSquare01/header.inc | 15 - data/maps/BattlePyramidSquare01/map.json | 112 + data/maps/BattlePyramidSquare02/events.inc | 12 - data/maps/BattlePyramidSquare02/header.inc | 15 - data/maps/BattlePyramidSquare02/map.json | 112 + data/maps/BattlePyramidSquare03/events.inc | 12 - data/maps/BattlePyramidSquare03/header.inc | 15 - data/maps/BattlePyramidSquare03/map.json | 112 + data/maps/BattlePyramidSquare04/events.inc | 12 - data/maps/BattlePyramidSquare04/header.inc | 15 - data/maps/BattlePyramidSquare04/map.json | 112 + data/maps/BattlePyramidSquare05/events.inc | 12 - data/maps/BattlePyramidSquare05/header.inc | 15 - data/maps/BattlePyramidSquare05/map.json | 112 + data/maps/BattlePyramidSquare06/events.inc | 12 - data/maps/BattlePyramidSquare06/header.inc | 15 - data/maps/BattlePyramidSquare06/map.json | 112 + data/maps/BattlePyramidSquare07/events.inc | 12 - data/maps/BattlePyramidSquare07/header.inc | 15 - data/maps/BattlePyramidSquare07/map.json | 112 + data/maps/BattlePyramidSquare08/events.inc | 12 - data/maps/BattlePyramidSquare08/header.inc | 15 - data/maps/BattlePyramidSquare08/map.json | 112 + data/maps/BattlePyramidSquare09/events.inc | 12 - data/maps/BattlePyramidSquare09/header.inc | 15 - data/maps/BattlePyramidSquare09/map.json | 112 + data/maps/BattlePyramidSquare10/events.inc | 12 - data/maps/BattlePyramidSquare10/header.inc | 15 - data/maps/BattlePyramidSquare10/map.json | 112 + data/maps/BattlePyramidSquare11/events.inc | 12 - data/maps/BattlePyramidSquare11/header.inc | 15 - data/maps/BattlePyramidSquare11/map.json | 112 + data/maps/BattlePyramidSquare12/events.inc | 12 - data/maps/BattlePyramidSquare12/header.inc | 15 - data/maps/BattlePyramidSquare12/map.json | 112 + data/maps/BattlePyramidSquare13/events.inc | 12 - data/maps/BattlePyramidSquare13/header.inc | 15 - data/maps/BattlePyramidSquare13/map.json | 112 + data/maps/BattlePyramidSquare14/events.inc | 12 - data/maps/BattlePyramidSquare14/header.inc | 15 - data/maps/BattlePyramidSquare14/map.json | 112 + data/maps/BattlePyramidSquare15/events.inc | 12 - data/maps/BattlePyramidSquare15/header.inc | 15 - data/maps/BattlePyramidSquare15/map.json | 112 + data/maps/BattlePyramidSquare16/events.inc | 12 - data/maps/BattlePyramidSquare16/header.inc | 15 - data/maps/BattlePyramidSquare16/map.json | 112 + data/maps/BirthIsland_Exterior/events.inc | 10 - data/maps/BirthIsland_Exterior/header.inc | 15 - data/maps/BirthIsland_Exterior/map.json | 55 + data/maps/BirthIsland_Harbor/events.inc | 10 - data/maps/BirthIsland_Harbor/header.inc | 15 - data/maps/BirthIsland_Harbor/map.json | 55 + data/maps/CaveOfOrigin_1F/events.inc | 7 - data/maps/CaveOfOrigin_1F/header.inc | 15 - data/maps/CaveOfOrigin_1F/map.json | 35 + data/maps/CaveOfOrigin_B1F/events.inc | 9 - data/maps/CaveOfOrigin_B1F/header.inc | 15 - data/maps/CaveOfOrigin_B1F/map.json | 42 + data/maps/CaveOfOrigin_Entrance/events.inc | 7 - data/maps/CaveOfOrigin_Entrance/header.inc | 15 - data/maps/CaveOfOrigin_Entrance/map.json | 35 + .../events.inc | 7 - .../header.inc | 15 - .../map.json | 35 + .../events.inc | 7 - .../header.inc | 15 - .../map.json | 35 + .../events.inc | 7 - .../header.inc | 15 - .../map.json | 35 + data/maps/DesertRuins/events.inc | 16 - data/maps/DesertRuins/header.inc | 15 - data/maps/DesertRuins/map.json | 81 + data/maps/DesertUnderpass/events.inc | 9 - data/maps/DesertUnderpass/header.inc | 15 - data/maps/DesertUnderpass/map.json | 42 + data/maps/DewfordTown/connections.inc | 8 - data/maps/DewfordTown/events.inc | 24 - data/maps/DewfordTown/header.inc | 15 - data/maps/DewfordTown/map.json | 174 + data/maps/DewfordTown_Gym/events.inc | 23 - data/maps/DewfordTown_Gym/header.inc | 15 - data/maps/DewfordTown_Gym/map.json | 173 + data/maps/DewfordTown_Hall/events.inc | 22 - data/maps/DewfordTown_Hall/header.inc | 15 - data/maps/DewfordTown_Hall/map.json | 170 + data/maps/DewfordTown_House1/events.inc | 12 - data/maps/DewfordTown_House1/header.inc | 15 - data/maps/DewfordTown_House1/map.json | 75 + data/maps/DewfordTown_House2/events.inc | 11 - data/maps/DewfordTown_House2/header.inc | 15 - data/maps/DewfordTown_House2/map.json | 62 + .../DewfordTown_PokemonCenter_1F/events.inc | 13 - .../DewfordTown_PokemonCenter_1F/header.inc | 15 - .../DewfordTown_PokemonCenter_1F/map.json | 82 + .../DewfordTown_PokemonCenter_2F/events.inc | 14 - .../DewfordTown_PokemonCenter_2F/header.inc | 15 - .../DewfordTown_PokemonCenter_2F/map.json | 95 + data/maps/DoubleBattleColosseum/events.inc | 15 - data/maps/DoubleBattleColosseum/header.inc | 15 - data/maps/DoubleBattleColosseum/map.json | 86 + data/maps/EverGrandeCity/connections.inc | 7 - data/maps/EverGrandeCity/events.inc | 29 - data/maps/EverGrandeCity/header.inc | 15 - data/maps/EverGrandeCity/map.json | 196 + .../EverGrandeCity_ChampionsRoom/events.inc | 12 - .../EverGrandeCity_ChampionsRoom/header.inc | 15 - .../EverGrandeCity_ChampionsRoom/map.json | 75 + .../maps/EverGrandeCity_DrakesRoom/events.inc | 10 - .../maps/EverGrandeCity_DrakesRoom/header.inc | 15 - data/maps/EverGrandeCity_DrakesRoom/map.json | 49 + .../EverGrandeCity_GlaciasRoom/events.inc | 10 - .../EverGrandeCity_GlaciasRoom/header.inc | 15 - data/maps/EverGrandeCity_GlaciasRoom/map.json | 49 + data/maps/EverGrandeCity_Hall1/events.inc | 9 - data/maps/EverGrandeCity_Hall1/header.inc | 15 - data/maps/EverGrandeCity_Hall1/map.json | 49 + data/maps/EverGrandeCity_Hall2/events.inc | 9 - data/maps/EverGrandeCity_Hall2/header.inc | 15 - data/maps/EverGrandeCity_Hall2/map.json | 49 + data/maps/EverGrandeCity_Hall3/events.inc | 9 - data/maps/EverGrandeCity_Hall3/header.inc | 15 - data/maps/EverGrandeCity_Hall3/map.json | 49 + data/maps/EverGrandeCity_Hall4/events.inc | 7 - data/maps/EverGrandeCity_Hall4/header.inc | 15 - data/maps/EverGrandeCity_Hall4/map.json | 35 + data/maps/EverGrandeCity_Hall5/events.inc | 9 - data/maps/EverGrandeCity_Hall5/header.inc | 15 - data/maps/EverGrandeCity_Hall5/map.json | 49 + .../maps/EverGrandeCity_HallOfFame/events.inc | 9 - .../maps/EverGrandeCity_HallOfFame/header.inc | 15 - data/maps/EverGrandeCity_HallOfFame/map.json | 42 + .../EverGrandeCity_PhoebesRoom/events.inc | 10 - .../EverGrandeCity_PhoebesRoom/header.inc | 15 - data/maps/EverGrandeCity_PhoebesRoom/map.json | 49 + .../events.inc | 14 - .../header.inc | 15 - .../EverGrandeCity_PokemonCenter_1F/map.json | 95 + .../events.inc | 14 - .../header.inc | 15 - .../EverGrandeCity_PokemonCenter_2F/map.json | 95 + .../events.inc | 16 - .../header.inc | 15 - .../EverGrandeCity_PokemonLeague_1F/map.json | 109 + .../events.inc | 14 - .../header.inc | 15 - .../EverGrandeCity_PokemonLeague_2F/map.json | 95 + .../EverGrandeCity_SidneysRoom/events.inc | 10 - .../EverGrandeCity_SidneysRoom/header.inc | 15 - data/maps/EverGrandeCity_SidneysRoom/map.json | 49 + data/maps/FallarborTown/connections.inc | 8 - data/maps/FallarborTown/events.inc | 26 - data/maps/FallarborTown/header.inc | 15 - data/maps/FallarborTown/map.json | 185 + .../events.inc | 8 - .../header.inc | 15 - .../map.json | 60 + .../events.inc | 6 - .../header.inc | 15 - .../FallarborTown_BattleTentCorridor/map.json | 34 + .../FallarborTown_BattleTentLobby/events.inc | 17 - .../FallarborTown_BattleTentLobby/header.inc | 15 - .../FallarborTown_BattleTentLobby/map.json | 110 + data/maps/FallarborTown_House1/events.inc | 11 - data/maps/FallarborTown_House1/header.inc | 15 - data/maps/FallarborTown_House1/map.json | 62 + data/maps/FallarborTown_House2/events.inc | 10 - data/maps/FallarborTown_House2/header.inc | 15 - data/maps/FallarborTown_House2/map.json | 49 + data/maps/FallarborTown_Mart/events.inc | 14 - data/maps/FallarborTown_Mart/header.inc | 15 - data/maps/FallarborTown_Mart/map.json | 101 + .../FallarborTown_PokemonCenter_1F/events.inc | 14 - .../FallarborTown_PokemonCenter_1F/header.inc | 15 - .../FallarborTown_PokemonCenter_1F/map.json | 95 + .../FallarborTown_PokemonCenter_2F/events.inc | 14 - .../FallarborTown_PokemonCenter_2F/header.inc | 15 - .../FallarborTown_PokemonCenter_2F/map.json | 95 + data/maps/FarawayIsland_Entrance/events.inc | 19 - data/maps/FarawayIsland_Entrance/header.inc | 15 - data/maps/FarawayIsland_Entrance/map.json | 99 + data/maps/FarawayIsland_Interior/events.inc | 10 - data/maps/FarawayIsland_Interior/header.inc | 15 - data/maps/FarawayIsland_Interior/map.json | 49 + data/maps/FieryPath/events.inc | 17 - data/maps/FieryPath/header.inc | 15 - data/maps/FieryPath/map.json | 140 + data/maps/FortreeCity/connections.inc | 8 - data/maps/FortreeCity/events.inc | 31 - data/maps/FortreeCity/header.inc | 15 - data/maps/FortreeCity/map.json | 236 + .../FortreeCity_DecorationShop/events.inc | 13 - .../FortreeCity_DecorationShop/header.inc | 15 - data/maps/FortreeCity_DecorationShop/map.json | 88 + data/maps/FortreeCity_Gym/events.inc | 21 - data/maps/FortreeCity_Gym/header.inc | 15 - data/maps/FortreeCity_Gym/map.json | 157 + data/maps/FortreeCity_House1/events.inc | 12 - data/maps/FortreeCity_House1/header.inc | 15 - data/maps/FortreeCity_House1/map.json | 75 + data/maps/FortreeCity_House2/events.inc | 11 - data/maps/FortreeCity_House2/header.inc | 15 - data/maps/FortreeCity_House2/map.json | 62 + data/maps/FortreeCity_House3/events.inc | 11 - data/maps/FortreeCity_House3/header.inc | 15 - data/maps/FortreeCity_House3/map.json | 62 + data/maps/FortreeCity_House4/events.inc | 12 - data/maps/FortreeCity_House4/header.inc | 15 - data/maps/FortreeCity_House4/map.json | 75 + data/maps/FortreeCity_House5/events.inc | 12 - data/maps/FortreeCity_House5/header.inc | 15 - data/maps/FortreeCity_House5/map.json | 75 + data/maps/FortreeCity_Mart/events.inc | 13 - data/maps/FortreeCity_Mart/header.inc | 15 - data/maps/FortreeCity_Mart/map.json | 88 + .../FortreeCity_PokemonCenter_1F/events.inc | 14 - .../FortreeCity_PokemonCenter_1F/header.inc | 15 - .../FortreeCity_PokemonCenter_1F/map.json | 95 + .../FortreeCity_PokemonCenter_2F/events.inc | 14 - .../FortreeCity_PokemonCenter_2F/header.inc | 15 - .../FortreeCity_PokemonCenter_2F/map.json | 95 + data/maps/GraniteCave_1F/events.inc | 13 - data/maps/GraniteCave_1F/header.inc | 15 - data/maps/GraniteCave_1F/map.json | 76 + data/maps/GraniteCave_B1F/events.inc | 15 - data/maps/GraniteCave_B1F/header.inc | 15 - data/maps/GraniteCave_B1F/map.json | 84 + data/maps/GraniteCave_B2F/events.inc | 25 - data/maps/GraniteCave_B2F/header.inc | 15 - data/maps/GraniteCave_B2F/map.json | 191 + data/maps/GraniteCave_StevensRoom/events.inc | 9 - data/maps/GraniteCave_StevensRoom/header.inc | 15 - data/maps/GraniteCave_StevensRoom/map.json | 42 + data/maps/InsideOfTruck/events.inc | 25 - data/maps/InsideOfTruck/header.inc | 15 - data/maps/InsideOfTruck/map.json | 151 + data/maps/IslandCave/events.inc | 16 - data/maps/IslandCave/header.inc | 15 - data/maps/IslandCave/map.json | 81 + data/maps/JaggedPass/events.inc | 35 - data/maps/JaggedPass/header.inc | 15 - data/maps/JaggedPass/map.json | 246 + data/maps/LavaridgeTown/connections.inc | 7 - data/maps/LavaridgeTown/events.inc | 35 - data/maps/LavaridgeTown/header.inc | 15 - data/maps/LavaridgeTown/map.json | 262 + data/maps/LavaridgeTown_Gym_1F/events.inc | 43 - data/maps/LavaridgeTown_Gym_1F/header.inc | 15 - data/maps/LavaridgeTown_Gym_1F/map.json | 299 ++ data/maps/LavaridgeTown_Gym_B1F/events.inc | 35 - data/maps/LavaridgeTown_Gym_B1F/header.inc | 15 - data/maps/LavaridgeTown_Gym_B1F/map.json | 242 + data/maps/LavaridgeTown_HerbShop/events.inc | 12 - data/maps/LavaridgeTown_HerbShop/header.inc | 15 - data/maps/LavaridgeTown_HerbShop/map.json | 75 + data/maps/LavaridgeTown_House/events.inc | 12 - data/maps/LavaridgeTown_House/header.inc | 15 - data/maps/LavaridgeTown_House/map.json | 75 + data/maps/LavaridgeTown_Mart/events.inc | 12 - data/maps/LavaridgeTown_Mart/header.inc | 15 - data/maps/LavaridgeTown_Mart/map.json | 75 + .../LavaridgeTown_PokemonCenter_1F/events.inc | 15 - .../LavaridgeTown_PokemonCenter_1F/header.inc | 15 - .../LavaridgeTown_PokemonCenter_1F/map.json | 102 + .../LavaridgeTown_PokemonCenter_2F/events.inc | 14 - .../LavaridgeTown_PokemonCenter_2F/header.inc | 15 - .../LavaridgeTown_PokemonCenter_2F/map.json | 95 + data/maps/LilycoveCity/connections.inc | 8 - data/maps/LilycoveCity/events.inc | 58 - data/maps/LilycoveCity/header.inc | 15 - data/maps/LilycoveCity/map.json | 522 ++ data/maps/LilycoveCity_ContestHall/events.inc | 51 - data/maps/LilycoveCity_ContestHall/header.inc | 15 - data/maps/LilycoveCity_ContestHall/map.json | 515 ++ .../maps/LilycoveCity_ContestLobby/events.inc | 50 - .../maps/LilycoveCity_ContestLobby/header.inc | 15 - data/maps/LilycoveCity_ContestLobby/map.json | 472 ++ .../LilycoveCity_CoveLilyMotel_1F/events.inc | 14 - .../LilycoveCity_CoveLilyMotel_1F/header.inc | 15 - .../LilycoveCity_CoveLilyMotel_1F/map.json | 66 + .../LilycoveCity_CoveLilyMotel_2F/events.inc | 15 - .../LilycoveCity_CoveLilyMotel_2F/header.inc | 15 - .../LilycoveCity_CoveLilyMotel_2F/map.json | 120 + .../events.inc | 10 - .../header.inc | 15 - .../map.json | 49 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 98 + .../events.inc | 20 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_1F/map.json | 137 + .../events.inc | 15 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_2F/map.json | 108 + .../events.inc | 15 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_3F/map.json | 108 + .../events.inc | 15 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_4F/map.json | 108 + .../events.inc | 17 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_5F/map.json | 134 + data/maps/LilycoveCity_Harbor/events.inc | 14 - data/maps/LilycoveCity_Harbor/header.inc | 15 - data/maps/LilycoveCity_Harbor/map.json | 101 + data/maps/LilycoveCity_House1/events.inc | 11 - data/maps/LilycoveCity_House1/header.inc | 15 - data/maps/LilycoveCity_House1/map.json | 62 + data/maps/LilycoveCity_House2/events.inc | 10 - data/maps/LilycoveCity_House2/header.inc | 15 - data/maps/LilycoveCity_House2/map.json | 49 + data/maps/LilycoveCity_House3/events.inc | 15 - data/maps/LilycoveCity_House3/header.inc | 15 - data/maps/LilycoveCity_House3/map.json | 114 + data/maps/LilycoveCity_House4/events.inc | 11 - data/maps/LilycoveCity_House4/header.inc | 15 - data/maps/LilycoveCity_House4/map.json | 62 + .../LilycoveCity_LilycoveMuseum_1F/events.inc | 38 - .../LilycoveCity_LilycoveMuseum_1F/header.inc | 15 - .../LilycoveCity_LilycoveMuseum_1F/map.json | 302 ++ .../LilycoveCity_LilycoveMuseum_2F/events.inc | 26 - .../LilycoveCity_LilycoveMuseum_2F/header.inc | 15 - .../LilycoveCity_LilycoveMuseum_2F/map.json | 178 + .../LilycoveCity_MoveDeletersHouse/events.inc | 10 - .../LilycoveCity_MoveDeletersHouse/header.inc | 15 - .../LilycoveCity_MoveDeletersHouse/map.json | 49 + .../LilycoveCity_PokemonCenter_1F/events.inc | 15 - .../LilycoveCity_PokemonCenter_1F/header.inc | 15 - .../LilycoveCity_PokemonCenter_1F/map.json | 108 + .../LilycoveCity_PokemonCenter_2F/events.inc | 14 - .../LilycoveCity_PokemonCenter_2F/header.inc | 15 - .../LilycoveCity_PokemonCenter_2F/map.json | 95 + .../events.inc | 18 - .../header.inc | 15 - .../map.json | 153 + data/maps/LilycoveCity_UnusedMart/events.inc | 7 - data/maps/LilycoveCity_UnusedMart/header.inc | 15 - data/maps/LilycoveCity_UnusedMart/map.json | 35 + data/maps/LinkContestRoom1/events.inc | 20 - data/maps/LinkContestRoom1/header.inc | 15 - data/maps/LinkContestRoom1/map.json | 216 + data/maps/LinkContestRoom2/events.inc | 1 - data/maps/LinkContestRoom2/header.inc | 15 - data/maps/LinkContestRoom2/map.json | 18 + data/maps/LinkContestRoom3/events.inc | 1 - data/maps/LinkContestRoom3/header.inc | 15 - data/maps/LinkContestRoom3/map.json | 18 + data/maps/LinkContestRoom4/events.inc | 1 - data/maps/LinkContestRoom4/header.inc | 15 - data/maps/LinkContestRoom4/map.json | 18 + data/maps/LinkContestRoom5/events.inc | 1 - data/maps/LinkContestRoom5/header.inc | 15 - data/maps/LinkContestRoom5/map.json | 18 + data/maps/LinkContestRoom6/events.inc | 1 - data/maps/LinkContestRoom6/header.inc | 15 - data/maps/LinkContestRoom6/map.json | 18 + data/maps/LittlerootTown/connections.inc | 7 - data/maps/LittlerootTown/events.inc | 35 - data/maps/LittlerootTown/header.inc | 15 - data/maps/LittlerootTown/map.json | 268 + .../events.inc | 23 - .../header.inc | 15 - .../LittlerootTown_BrendansHouse_1F/map.json | 171 + .../events.inc | 30 - .../header.inc | 15 - .../LittlerootTown_BrendansHouse_2F/map.json | 270 + .../LittlerootTown_MaysHouse_1F/events.inc | 23 - .../LittlerootTown_MaysHouse_1F/header.inc | 15 - .../maps/LittlerootTown_MaysHouse_1F/map.json | 171 + .../LittlerootTown_MaysHouse_2F/events.inc | 30 - .../LittlerootTown_MaysHouse_2F/header.inc | 15 - .../maps/LittlerootTown_MaysHouse_2F/map.json | 270 + .../events.inc | 32 - .../header.inc | 15 - .../map.json | 235 + .../scripts.inc | 4 +- data/maps/MagmaHideout_1F/events.inc | 17 - data/maps/MagmaHideout_1F/header.inc | 15 - data/maps/MagmaHideout_1F/map.json | 128 + data/maps/MagmaHideout_2F_1R/events.inc | 14 - data/maps/MagmaHideout_2F_1R/header.inc | 15 - data/maps/MagmaHideout_2F_1R/map.json | 95 + data/maps/MagmaHideout_2F_2R/events.inc | 15 - data/maps/MagmaHideout_2F_2R/header.inc | 15 - data/maps/MagmaHideout_2F_2R/map.json | 114 + data/maps/MagmaHideout_2F_3R/events.inc | 7 - data/maps/MagmaHideout_2F_3R/header.inc | 15 - data/maps/MagmaHideout_2F_3R/map.json | 35 + data/maps/MagmaHideout_3F_1R/events.inc | 13 - data/maps/MagmaHideout_3F_1R/header.inc | 15 - data/maps/MagmaHideout_3F_1R/map.json | 82 + data/maps/MagmaHideout_3F_2R/events.inc | 10 - data/maps/MagmaHideout_3F_2R/header.inc | 15 - data/maps/MagmaHideout_3F_2R/map.json | 55 + data/maps/MagmaHideout_3F_3R/events.inc | 10 - data/maps/MagmaHideout_3F_3R/header.inc | 15 - data/maps/MagmaHideout_3F_3R/map.json | 49 + data/maps/MagmaHideout_4F/events.inc | 17 - data/maps/MagmaHideout_4F/header.inc | 15 - data/maps/MagmaHideout_4F/map.json | 140 + data/maps/MarineCave_End/events.inc | 12 - data/maps/MarineCave_End/header.inc | 15 - data/maps/MarineCave_End/map.json | 52 + data/maps/MarineCave_Entrance/events.inc | 6 - data/maps/MarineCave_Entrance/header.inc | 15 - data/maps/MarineCave_Entrance/map.json | 28 + data/maps/MauvilleCity/connections.inc | 10 - data/maps/MauvilleCity/events.inc | 35 - data/maps/MauvilleCity/header.inc | 15 - data/maps/MauvilleCity/map.json | 300 ++ data/maps/MauvilleCity_BikeShop/events.inc | 15 - data/maps/MauvilleCity_BikeShop/header.inc | 15 - data/maps/MauvilleCity_BikeShop/map.json | 79 + data/maps/MauvilleCity_GameCorner/events.inc | 47 - data/maps/MauvilleCity_GameCorner/header.inc | 15 - data/maps/MauvilleCity_GameCorner/map.json | 385 ++ data/maps/MauvilleCity_Gym/events.inc | 26 - data/maps/MauvilleCity_Gym/header.inc | 15 - data/maps/MauvilleCity_Gym/map.json | 181 + data/maps/MauvilleCity_House1/events.inc | 10 - data/maps/MauvilleCity_House1/header.inc | 15 - data/maps/MauvilleCity_House1/map.json | 49 + data/maps/MauvilleCity_House2/events.inc | 10 - data/maps/MauvilleCity_House2/header.inc | 15 - data/maps/MauvilleCity_House2/map.json | 49 + data/maps/MauvilleCity_Mart/events.inc | 12 - data/maps/MauvilleCity_Mart/header.inc | 15 - data/maps/MauvilleCity_Mart/map.json | 75 + .../MauvilleCity_PokemonCenter_1F/events.inc | 15 - .../MauvilleCity_PokemonCenter_1F/header.inc | 15 - .../MauvilleCity_PokemonCenter_1F/map.json | 108 + .../MauvilleCity_PokemonCenter_2F/events.inc | 15 - .../MauvilleCity_PokemonCenter_2F/header.inc | 15 - .../MauvilleCity_PokemonCenter_2F/map.json | 108 + data/maps/MeteorFalls_1F_1R/events.inc | 29 - data/maps/MeteorFalls_1F_1R/header.inc | 15 - data/maps/MeteorFalls_1F_1R/map.json | 213 + data/maps/MeteorFalls_1F_2R/events.inc | 17 - data/maps/MeteorFalls_1F_2R/header.inc | 15 - data/maps/MeteorFalls_1F_2R/map.json | 98 + data/maps/MeteorFalls_B1F_1R/events.inc | 11 - data/maps/MeteorFalls_B1F_1R/header.inc | 15 - data/maps/MeteorFalls_B1F_1R/map.json | 63 + data/maps/MeteorFalls_B1F_2R/events.inc | 9 - data/maps/MeteorFalls_B1F_2R/header.inc | 15 - data/maps/MeteorFalls_B1F_2R/map.json | 42 + data/maps/MeteorFalls_StevensCave/events.inc | 9 - data/maps/MeteorFalls_StevensCave/header.inc | 15 - data/maps/MeteorFalls_StevensCave/map.json | 42 + data/maps/MirageTower_1F/events.inc | 7 - data/maps/MirageTower_1F/header.inc | 15 - data/maps/MirageTower_1F/map.json | 35 + data/maps/MirageTower_2F/events.inc | 7 - data/maps/MirageTower_2F/header.inc | 15 - data/maps/MirageTower_2F/map.json | 35 + data/maps/MirageTower_3F/events.inc | 11 - data/maps/MirageTower_3F/header.inc | 15 - data/maps/MirageTower_3F/map.json | 62 + data/maps/MirageTower_4F/events.inc | 11 - data/maps/MirageTower_4F/header.inc | 15 - data/maps/MirageTower_4F/map.json | 68 + data/maps/MossdeepCity/connections.inc | 9 - data/maps/MossdeepCity/events.inc | 56 - data/maps/MossdeepCity/header.inc | 15 - data/maps/MossdeepCity/map.json | 485 ++ .../MossdeepCity_GameCorner_1F/events.inc | 17 - .../MossdeepCity_GameCorner_1F/header.inc | 15 - data/maps/MossdeepCity_GameCorner_1F/map.json | 94 + .../MossdeepCity_GameCorner_B1F/events.inc | 9 - .../MossdeepCity_GameCorner_B1F/header.inc | 15 - .../maps/MossdeepCity_GameCorner_B1F/map.json | 42 + data/maps/MossdeepCity_Gym/events.inc | 72 - data/maps/MossdeepCity_Gym/header.inc | 15 - data/maps/MossdeepCity_Gym/map.json | 687 +++ data/maps/MossdeepCity_House1/events.inc | 11 - data/maps/MossdeepCity_House1/header.inc | 15 - data/maps/MossdeepCity_House1/map.json | 62 + data/maps/MossdeepCity_House2/events.inc | 12 - data/maps/MossdeepCity_House2/header.inc | 15 - data/maps/MossdeepCity_House2/map.json | 75 + data/maps/MossdeepCity_House3/events.inc | 10 - data/maps/MossdeepCity_House3/header.inc | 15 - data/maps/MossdeepCity_House3/map.json | 49 + data/maps/MossdeepCity_House4/events.inc | 12 - data/maps/MossdeepCity_House4/header.inc | 15 - data/maps/MossdeepCity_House4/map.json | 75 + data/maps/MossdeepCity_Mart/events.inc | 13 - data/maps/MossdeepCity_Mart/header.inc | 15 - data/maps/MossdeepCity_Mart/map.json | 88 + .../MossdeepCity_PokemonCenter_1F/events.inc | 13 - .../MossdeepCity_PokemonCenter_1F/header.inc | 15 - .../MossdeepCity_PokemonCenter_1F/map.json | 82 + .../MossdeepCity_PokemonCenter_2F/events.inc | 15 - .../MossdeepCity_PokemonCenter_2F/header.inc | 15 - .../MossdeepCity_PokemonCenter_2F/map.json | 108 + .../MossdeepCity_SpaceCenter_1F/events.inc | 21 - .../MossdeepCity_SpaceCenter_1F/header.inc | 15 - .../maps/MossdeepCity_SpaceCenter_1F/map.json | 186 + .../MossdeepCity_SpaceCenter_2F/events.inc | 17 - .../MossdeepCity_SpaceCenter_2F/header.inc | 15 - .../maps/MossdeepCity_SpaceCenter_2F/map.json | 146 + .../maps/MossdeepCity_StevensHouse/events.inc | 18 - .../maps/MossdeepCity_StevensHouse/header.inc | 15 - data/maps/MossdeepCity_StevensHouse/map.json | 108 + data/maps/MtChimney/events.inc | 45 - data/maps/MtChimney/header.inc | 15 - data/maps/MtChimney/map.json | 457 ++ .../maps/MtChimney_CableCarStation/events.inc | 11 - .../maps/MtChimney_CableCarStation/header.inc | 15 - data/maps/MtChimney_CableCarStation/map.json | 62 + data/maps/MtPyre_1F/events.inc | 16 - data/maps/MtPyre_1F/header.inc | 15 - data/maps/MtPyre_1F/map.json | 103 + data/maps/MtPyre_2F/events.inc | 20 - data/maps/MtPyre_2F/header.inc | 15 - data/maps/MtPyre_2F/map.json | 161 + data/maps/MtPyre_3F/events.inc | 17 - data/maps/MtPyre_3F/header.inc | 15 - data/maps/MtPyre_3F/map.json | 116 + data/maps/MtPyre_4F/events.inc | 15 - data/maps/MtPyre_4F/header.inc | 15 - data/maps/MtPyre_4F/map.json | 90 + data/maps/MtPyre_5F/events.inc | 14 - data/maps/MtPyre_5F/header.inc | 15 - data/maps/MtPyre_5F/map.json | 83 + data/maps/MtPyre_6F/events.inc | 12 - data/maps/MtPyre_6F/header.inc | 15 - data/maps/MtPyre_6F/map.json | 75 + data/maps/MtPyre_Exterior/events.inc | 23 - data/maps/MtPyre_Exterior/header.inc | 15 - data/maps/MtPyre_Exterior/map.json | 132 + data/maps/MtPyre_Summit/events.inc | 30 - data/maps/MtPyre_Summit/header.inc | 15 - data/maps/MtPyre_Summit/map.json | 219 + data/maps/NavelRock_B1F/events.inc | 7 - data/maps/NavelRock_B1F/header.inc | 15 - data/maps/NavelRock_B1F/map.json | 35 + data/maps/NavelRock_Bottom/events.inc | 9 - data/maps/NavelRock_Bottom/header.inc | 15 - data/maps/NavelRock_Bottom/map.json | 42 + data/maps/NavelRock_Down01/events.inc | 7 - data/maps/NavelRock_Down01/header.inc | 15 - data/maps/NavelRock_Down01/map.json | 35 + data/maps/NavelRock_Down02/events.inc | 7 - data/maps/NavelRock_Down02/header.inc | 15 - data/maps/NavelRock_Down02/map.json | 35 + data/maps/NavelRock_Down03/events.inc | 7 - data/maps/NavelRock_Down03/header.inc | 15 - data/maps/NavelRock_Down03/map.json | 35 + data/maps/NavelRock_Down04/events.inc | 7 - data/maps/NavelRock_Down04/header.inc | 15 - data/maps/NavelRock_Down04/map.json | 35 + data/maps/NavelRock_Down05/events.inc | 7 - data/maps/NavelRock_Down05/header.inc | 15 - data/maps/NavelRock_Down05/map.json | 35 + data/maps/NavelRock_Down06/events.inc | 7 - data/maps/NavelRock_Down06/header.inc | 15 - data/maps/NavelRock_Down06/map.json | 35 + data/maps/NavelRock_Down07/events.inc | 7 - data/maps/NavelRock_Down07/header.inc | 15 - data/maps/NavelRock_Down07/map.json | 35 + data/maps/NavelRock_Down08/events.inc | 7 - data/maps/NavelRock_Down08/header.inc | 15 - data/maps/NavelRock_Down08/map.json | 35 + data/maps/NavelRock_Down09/events.inc | 7 - data/maps/NavelRock_Down09/header.inc | 15 - data/maps/NavelRock_Down09/map.json | 35 + data/maps/NavelRock_Down10/events.inc | 7 - data/maps/NavelRock_Down10/header.inc | 15 - data/maps/NavelRock_Down10/map.json | 35 + data/maps/NavelRock_Down11/events.inc | 7 - data/maps/NavelRock_Down11/header.inc | 15 - data/maps/NavelRock_Down11/map.json | 35 + data/maps/NavelRock_Entrance/events.inc | 7 - data/maps/NavelRock_Entrance/header.inc | 15 - data/maps/NavelRock_Entrance/map.json | 35 + data/maps/NavelRock_Exterior/events.inc | 7 - data/maps/NavelRock_Exterior/header.inc | 15 - data/maps/NavelRock_Exterior/map.json | 35 + data/maps/NavelRock_Fork/events.inc | 8 - data/maps/NavelRock_Fork/header.inc | 15 - data/maps/NavelRock_Fork/map.json | 42 + data/maps/NavelRock_Harbor/events.inc | 10 - data/maps/NavelRock_Harbor/header.inc | 15 - data/maps/NavelRock_Harbor/map.json | 55 + data/maps/NavelRock_Top/events.inc | 15 - data/maps/NavelRock_Top/header.inc | 15 - data/maps/NavelRock_Top/map.json | 61 + data/maps/NavelRock_Up1/events.inc | 7 - data/maps/NavelRock_Up1/header.inc | 15 - data/maps/NavelRock_Up1/map.json | 35 + data/maps/NavelRock_Up2/events.inc | 7 - data/maps/NavelRock_Up2/header.inc | 15 - data/maps/NavelRock_Up2/map.json | 35 + data/maps/NavelRock_Up3/events.inc | 7 - data/maps/NavelRock_Up3/header.inc | 15 - data/maps/NavelRock_Up3/map.json | 35 + data/maps/NavelRock_Up4/events.inc | 7 - data/maps/NavelRock_Up4/header.inc | 15 - data/maps/NavelRock_Up4/map.json | 35 + data/maps/NewMauville_Entrance/events.inc | 10 - data/maps/NewMauville_Entrance/header.inc | 15 - data/maps/NewMauville_Entrance/map.json | 45 + data/maps/NewMauville_Inside/events.inc | 38 - data/maps/NewMauville_Inside/header.inc | 15 - data/maps/NewMauville_Inside/map.json | 289 ++ data/maps/OldaleTown/connections.inc | 9 - data/maps/OldaleTown/events.inc | 28 - data/maps/OldaleTown/header.inc | 15 - data/maps/OldaleTown/map.json | 196 + data/maps/OldaleTown_House1/events.inc | 10 - data/maps/OldaleTown_House1/header.inc | 15 - data/maps/OldaleTown_House1/map.json | 49 + data/maps/OldaleTown_House2/events.inc | 11 - data/maps/OldaleTown_House2/header.inc | 15 - data/maps/OldaleTown_House2/map.json | 62 + data/maps/OldaleTown_Mart/events.inc | 12 - data/maps/OldaleTown_Mart/header.inc | 15 - data/maps/OldaleTown_Mart/map.json | 75 + .../OldaleTown_PokemonCenter_1F/events.inc | 14 - .../OldaleTown_PokemonCenter_1F/header.inc | 15 - .../maps/OldaleTown_PokemonCenter_1F/map.json | 95 + .../OldaleTown_PokemonCenter_2F/events.inc | 14 - .../OldaleTown_PokemonCenter_2F/header.inc | 15 - .../maps/OldaleTown_PokemonCenter_2F/map.json | 95 + data/maps/PacifidlogTown/connections.inc | 8 - data/maps/PacifidlogTown/events.inc | 21 - data/maps/PacifidlogTown/header.inc | 15 - data/maps/PacifidlogTown/map.json | 139 + data/maps/PacifidlogTown_House1/events.inc | 11 - data/maps/PacifidlogTown_House1/header.inc | 15 - data/maps/PacifidlogTown_House1/map.json | 62 + data/maps/PacifidlogTown_House2/events.inc | 12 - data/maps/PacifidlogTown_House2/header.inc | 15 - data/maps/PacifidlogTown_House2/map.json | 75 + data/maps/PacifidlogTown_House3/events.inc | 11 - data/maps/PacifidlogTown_House3/header.inc | 15 - data/maps/PacifidlogTown_House3/map.json | 62 + data/maps/PacifidlogTown_House4/events.inc | 12 - data/maps/PacifidlogTown_House4/header.inc | 15 - data/maps/PacifidlogTown_House4/map.json | 75 + data/maps/PacifidlogTown_House5/events.inc | 11 - data/maps/PacifidlogTown_House5/header.inc | 15 - data/maps/PacifidlogTown_House5/map.json | 62 + .../events.inc | 15 - .../header.inc | 15 - .../PacifidlogTown_PokemonCenter_1F/map.json | 108 + .../events.inc | 14 - .../header.inc | 15 - .../PacifidlogTown_PokemonCenter_2F/map.json | 95 + data/maps/PetalburgCity/connections.inc | 8 - data/maps/PetalburgCity/events.inc | 42 - data/maps/PetalburgCity/header.inc | 15 - data/maps/PetalburgCity/map.json | 330 ++ data/maps/PetalburgCity_Gym/events.inc | 72 - data/maps/PetalburgCity_Gym/header.inc | 15 - data/maps/PetalburgCity_Gym/map.json | 544 ++ data/maps/PetalburgCity_House1/events.inc | 11 - data/maps/PetalburgCity_House1/header.inc | 15 - data/maps/PetalburgCity_House1/map.json | 62 + data/maps/PetalburgCity_House2/events.inc | 11 - data/maps/PetalburgCity_House2/header.inc | 15 - data/maps/PetalburgCity_House2/map.json | 62 + data/maps/PetalburgCity_Mart/events.inc | 13 - data/maps/PetalburgCity_Mart/header.inc | 15 - data/maps/PetalburgCity_Mart/map.json | 88 + .../PetalburgCity_PokemonCenter_1F/events.inc | 15 - .../PetalburgCity_PokemonCenter_1F/header.inc | 15 - .../PetalburgCity_PokemonCenter_1F/map.json | 108 + .../PetalburgCity_PokemonCenter_2F/events.inc | 14 - .../PetalburgCity_PokemonCenter_2F/header.inc | 15 - .../PetalburgCity_PokemonCenter_2F/map.json | 95 + .../maps/PetalburgCity_WallysHouse/events.inc | 11 - .../maps/PetalburgCity_WallysHouse/header.inc | 15 - data/maps/PetalburgCity_WallysHouse/map.json | 62 + data/maps/PetalburgWoods/events.inc | 38 - data/maps/PetalburgWoods/header.inc | 15 - data/maps/PetalburgWoods/map.json | 301 ++ data/maps/RecordCorner/events.inc | 18 - data/maps/RecordCorner/header.inc | 15 - data/maps/RecordCorner/map.json | 100 + data/maps/Route101/connections.inc | 8 - data/maps/Route101/events.inc | 25 - data/maps/Route101/header.inc | 15 - data/maps/Route101/map.json | 201 + data/maps/Route102/connections.inc | 8 - data/maps/Route102/events.inc | 18 - data/maps/Route102/header.inc | 15 - data/maps/Route102/map.json | 166 + data/maps/Route103/connections.inc | 8 - data/maps/Route103/events.inc | 31 - data/maps/Route103/header.inc | 15 - data/maps/Route103/map.json | 309 ++ data/maps/Route104/connections.inc | 9 - data/maps/Route104/events.inc | 64 - data/maps/Route104/header.inc | 15 - data/maps/Route104/map.json | 627 +++ data/maps/Route104_MrBrineysHouse/events.inc | 11 - data/maps/Route104_MrBrineysHouse/header.inc | 15 - data/maps/Route104_MrBrineysHouse/map.json | 62 + .../Route104_PrettyPetalFlowerShop/events.inc | 12 - .../Route104_PrettyPetalFlowerShop/header.inc | 15 - .../Route104_PrettyPetalFlowerShop/map.json | 75 + data/maps/Route104_Prototype/events.inc | 3 - data/maps/Route104_Prototype/header.inc | 15 - data/maps/Route104_Prototype/map.json | 20 + .../events.inc | 3 - .../header.inc | 15 - .../map.json | 20 + data/maps/Route105/connections.inc | 9 - data/maps/Route105/events.inc | 20 - data/maps/Route105/header.inc | 15 - data/maps/Route105/map.json | 166 + data/maps/Route106/connections.inc | 8 - data/maps/Route106/events.inc | 19 - data/maps/Route106/header.inc | 15 - data/maps/Route106/map.json | 138 + data/maps/Route107/connections.inc | 8 - data/maps/Route107/events.inc | 12 - data/maps/Route107/header.inc | 15 - data/maps/Route107/map.json | 123 + data/maps/Route108/connections.inc | 8 - data/maps/Route108/events.inc | 18 - data/maps/Route108/header.inc | 15 - data/maps/Route108/map.json | 140 + data/maps/Route109/connections.inc | 8 - data/maps/Route109/events.inc | 42 - data/maps/Route109/header.inc | 15 - data/maps/Route109/map.json | 417 ++ data/maps/Route109_SeashoreHouse/events.inc | 13 - data/maps/Route109_SeashoreHouse/header.inc | 15 - data/maps/Route109_SeashoreHouse/map.json | 88 + data/maps/Route110/connections.inc | 9 - data/maps/Route110/events.inc | 79 - data/maps/Route110/header.inc | 15 - data/maps/Route110/map.json | 765 +++ .../events.inc | 16 - .../header.inc | 15 - .../map.json | 82 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 82 + .../Route110_TrickHouseCorridor/events.inc | 9 - .../Route110_TrickHouseCorridor/header.inc | 15 - .../maps/Route110_TrickHouseCorridor/map.json | 49 + data/maps/Route110_TrickHouseEnd/events.inc | 16 - data/maps/Route110_TrickHouseEnd/header.inc | 15 - data/maps/Route110_TrickHouseEnd/map.json | 68 + .../Route110_TrickHouseEntrance/events.inc | 20 - .../Route110_TrickHouseEntrance/header.inc | 15 - .../maps/Route110_TrickHouseEntrance/map.json | 102 + .../Route110_TrickHousePuzzle1/events.inc | 28 - .../Route110_TrickHousePuzzle1/header.inc | 15 - data/maps/Route110_TrickHousePuzzle1/map.json | 247 + .../Route110_TrickHousePuzzle2/events.inc | 24 - .../Route110_TrickHousePuzzle2/header.inc | 15 - data/maps/Route110_TrickHousePuzzle2/map.json | 154 + .../Route110_TrickHousePuzzle3/events.inc | 26 - .../Route110_TrickHousePuzzle3/header.inc | 15 - data/maps/Route110_TrickHousePuzzle3/map.json | 180 + .../Route110_TrickHousePuzzle4/events.inc | 27 - .../Route110_TrickHousePuzzle4/header.inc | 15 - data/maps/Route110_TrickHousePuzzle4/map.json | 234 + .../Route110_TrickHousePuzzle5/events.inc | 42 - .../Route110_TrickHousePuzzle5/header.inc | 15 - data/maps/Route110_TrickHousePuzzle5/map.json | 316 ++ .../Route110_TrickHousePuzzle6/events.inc | 17 - .../Route110_TrickHousePuzzle6/header.inc | 15 - data/maps/Route110_TrickHousePuzzle6/map.json | 104 + .../Route110_TrickHousePuzzle7/events.inc | 38 - .../Route110_TrickHousePuzzle7/header.inc | 15 - data/maps/Route110_TrickHousePuzzle7/map.json | 276 ++ .../Route110_TrickHousePuzzle8/events.inc | 17 - .../Route110_TrickHousePuzzle8/header.inc | 15 - data/maps/Route110_TrickHousePuzzle8/map.json | 104 + data/maps/Route111/connections.inc | 9 - data/maps/Route111/events.inc | 114 - data/maps/Route111/header.inc | 15 - data/maps/Route111/map.json | 1115 +++++ data/maps/Route111/scripts.inc | 2 +- .../maps/Route111_OldLadysRestStop/events.inc | 10 - .../maps/Route111_OldLadysRestStop/header.inc | 15 - data/maps/Route111_OldLadysRestStop/map.json | 49 + .../Route111_WinstrateFamilysHouse/events.inc | 13 - .../Route111_WinstrateFamilysHouse/header.inc | 15 - .../Route111_WinstrateFamilysHouse/map.json | 88 + data/maps/Route112/connections.inc | 9 - data/maps/Route112/events.inc | 32 - data/maps/Route112/header.inc | 15 - data/maps/Route112/map.json | 287 ++ data/maps/Route112_CableCarStation/events.inc | 11 - data/maps/Route112_CableCarStation/header.inc | 15 - data/maps/Route112_CableCarStation/map.json | 62 + data/maps/Route113/connections.inc | 9 - data/maps/Route113/events.inc | 57 - data/maps/Route113/header.inc | 15 - data/maps/Route113/map.json | 465 ++ data/maps/Route113_GlassWorkshop/events.inc | 11 - data/maps/Route113_GlassWorkshop/header.inc | 15 - data/maps/Route113_GlassWorkshop/map.json | 62 + data/maps/Route114/connections.inc | 8 - data/maps/Route114/events.inc | 53 - data/maps/Route114/header.inc | 15 - data/maps/Route114/map.json | 509 ++ .../Route114_FossilManiacsHouse/events.inc | 17 - .../Route114_FossilManiacsHouse/header.inc | 15 - .../maps/Route114_FossilManiacsHouse/map.json | 89 + .../Route114_FossilManiacsTunnel/events.inc | 15 - .../Route114_FossilManiacsTunnel/header.inc | 15 - .../Route114_FossilManiacsTunnel/map.json | 75 + data/maps/Route114_LanettesHouse/events.inc | 15 - data/maps/Route114_LanettesHouse/header.inc | 15 - data/maps/Route114_LanettesHouse/map.json | 74 + data/maps/Route115/connections.inc | 8 - data/maps/Route115/events.inc | 49 - data/maps/Route115/header.inc | 15 - data/maps/Route115/map.json | 455 ++ data/maps/Route116/connections.inc | 8 - data/maps/Route116/events.inc | 56 - data/maps/Route116/header.inc | 15 - data/maps/Route116/map.json | 527 ++ .../Route116_TunnelersRestHouse/events.inc | 12 - .../Route116_TunnelersRestHouse/header.inc | 15 - .../maps/Route116_TunnelersRestHouse/map.json | 75 + data/maps/Route117/connections.inc | 8 - data/maps/Route117/events.inc | 38 - data/maps/Route117/header.inc | 15 - data/maps/Route117/map.json | 385 ++ data/maps/Route117_PokemonDayCare/events.inc | 10 - data/maps/Route117_PokemonDayCare/header.inc | 15 - data/maps/Route117_PokemonDayCare/map.json | 49 + data/maps/Route118/connections.inc | 9 - data/maps/Route118/events.inc | 46 - data/maps/Route118/header.inc | 15 - data/maps/Route118/map.json | 421 ++ data/maps/Route119/connections.inc | 8 - data/maps/Route119/events.inc | 99 - data/maps/Route119/header.inc | 15 - data/maps/Route119/map.json | 920 ++++ data/maps/Route119_House/events.inc | 16 - data/maps/Route119_House/header.inc | 15 - data/maps/Route119_House/map.json | 127 + .../Route119_WeatherInstitute_1F/events.inc | 21 - .../Route119_WeatherInstitute_1F/header.inc | 15 - .../Route119_WeatherInstitute_1F/map.json | 141 + .../Route119_WeatherInstitute_2F/events.inc | 16 - .../Route119_WeatherInstitute_2F/header.inc | 15 - .../Route119_WeatherInstitute_2F/map.json | 133 + data/maps/Route120/connections.inc | 8 - data/maps/Route120/events.inc | 90 - data/maps/Route120/header.inc | 15 - data/maps/Route120/map.json | 858 ++++ data/maps/Route121/connections.inc | 9 - data/maps/Route121/events.inc | 55 - data/maps/Route121/header.inc | 15 - data/maps/Route121/map.json | 536 ++ .../Route121_SafariZoneEntrance/events.inc | 20 - .../Route121_SafariZoneEntrance/header.inc | 15 - .../maps/Route121_SafariZoneEntrance/map.json | 108 + data/maps/Route122/connections.inc | 8 - data/maps/Route122/events.inc | 6 - data/maps/Route122/header.inc | 15 - data/maps/Route122/map.json | 39 + data/maps/Route123/connections.inc | 8 - data/maps/Route123/events.inc | 88 - data/maps/Route123/header.inc | 15 - data/maps/Route123/map.json | 840 ++++ .../Route123_BerryMastersHouse/events.inc | 11 - .../Route123_BerryMastersHouse/header.inc | 15 - data/maps/Route123_BerryMastersHouse/map.json | 62 + data/maps/Route124/connections.inc | 11 - data/maps/Route124/events.inc | 23 - data/maps/Route124/header.inc | 15 - data/maps/Route124/map.json | 220 + .../events.inc | 13 - .../header.inc | 15 - .../map.json | 58 + data/maps/Route125/connections.inc | 9 - data/maps/Route125/events.inc | 24 - data/maps/Route125/header.inc | 15 - data/maps/Route125/map.json | 204 + data/maps/Route126/connections.inc | 9 - data/maps/Route126/events.inc | 14 - data/maps/Route126/header.inc | 15 - data/maps/Route126/map.json | 154 + data/maps/Route127/connections.inc | 10 - data/maps/Route127/events.inc | 23 - data/maps/Route127/header.inc | 15 - data/maps/Route127/map.json | 221 + data/maps/Route128/connections.inc | 10 - data/maps/Route128/events.inc | 20 - data/maps/Route128/header.inc | 15 - data/maps/Route128/map.json | 197 + data/maps/Route129/connections.inc | 9 - data/maps/Route129/events.inc | 10 - data/maps/Route129/header.inc | 15 - data/maps/Route129/map.json | 102 + data/maps/Route130/connections.inc | 8 - data/maps/Route130/events.inc | 9 - data/maps/Route130/header.inc | 15 - data/maps/Route130/map.json | 84 + data/maps/Route130/scripts.inc | 4 +- data/maps/Route131/connections.inc | 8 - data/maps/Route131/events.inc | 16 - data/maps/Route131/header.inc | 15 - data/maps/Route131/map.json | 144 + data/maps/Route131/scripts.inc | 2 +- data/maps/Route132/connections.inc | 8 - data/maps/Route132/events.inc | 15 - data/maps/Route132/header.inc | 15 - data/maps/Route132/map.json | 162 + data/maps/Route133/connections.inc | 8 - data/maps/Route133/events.inc | 15 - data/maps/Route133/header.inc | 15 - data/maps/Route133/map.json | 162 + data/maps/Route134/connections.inc | 8 - data/maps/Route134/events.inc | 16 - data/maps/Route134/header.inc | 15 - data/maps/Route134/map.json | 175 + data/maps/RustboroCity/connections.inc | 9 - data/maps/RustboroCity/events.inc | 70 - data/maps/RustboroCity/header.inc | 15 - data/maps/RustboroCity/map.json | 601 +++ .../maps/RustboroCity_CuttersHouse/events.inc | 11 - .../maps/RustboroCity_CuttersHouse/header.inc | 15 - data/maps/RustboroCity_CuttersHouse/map.json | 62 + .../maps/RustboroCity_DevonCorp_1F/events.inc | 17 - .../maps/RustboroCity_DevonCorp_1F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_1F/map.json | 99 + .../maps/RustboroCity_DevonCorp_2F/events.inc | 15 - .../maps/RustboroCity_DevonCorp_2F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_2F/map.json | 114 + .../maps/RustboroCity_DevonCorp_3F/events.inc | 15 - .../maps/RustboroCity_DevonCorp_3F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_3F/map.json | 85 + data/maps/RustboroCity_Flat1_1F/events.inc | 12 - data/maps/RustboroCity_Flat1_1F/header.inc | 15 - data/maps/RustboroCity_Flat1_1F/map.json | 69 + data/maps/RustboroCity_Flat1_2F/events.inc | 16 - data/maps/RustboroCity_Flat1_2F/header.inc | 15 - data/maps/RustboroCity_Flat1_2F/map.json | 133 + data/maps/RustboroCity_Flat2_1F/events.inc | 12 - data/maps/RustboroCity_Flat2_1F/header.inc | 15 - data/maps/RustboroCity_Flat2_1F/map.json | 69 + data/maps/RustboroCity_Flat2_2F/events.inc | 11 - data/maps/RustboroCity_Flat2_2F/header.inc | 15 - data/maps/RustboroCity_Flat2_2F/map.json | 62 + data/maps/RustboroCity_Flat2_3F/events.inc | 10 - data/maps/RustboroCity_Flat2_3F/header.inc | 15 - data/maps/RustboroCity_Flat2_3F/map.json | 55 + data/maps/RustboroCity_Gym/events.inc | 18 - data/maps/RustboroCity_Gym/header.inc | 15 - data/maps/RustboroCity_Gym/map.json | 118 + data/maps/RustboroCity_House1/events.inc | 11 - data/maps/RustboroCity_House1/header.inc | 15 - data/maps/RustboroCity_House1/map.json | 62 + data/maps/RustboroCity_House2/events.inc | 11 - data/maps/RustboroCity_House2/header.inc | 15 - data/maps/RustboroCity_House2/map.json | 62 + data/maps/RustboroCity_House3/events.inc | 12 - data/maps/RustboroCity_House3/header.inc | 15 - data/maps/RustboroCity_House3/map.json | 75 + data/maps/RustboroCity_Mart/events.inc | 13 - data/maps/RustboroCity_Mart/header.inc | 15 - data/maps/RustboroCity_Mart/map.json | 88 + .../RustboroCity_PokemonCenter_1F/events.inc | 14 - .../RustboroCity_PokemonCenter_1F/header.inc | 15 - .../RustboroCity_PokemonCenter_1F/map.json | 95 + .../RustboroCity_PokemonCenter_2F/events.inc | 14 - .../RustboroCity_PokemonCenter_2F/header.inc | 15 - .../RustboroCity_PokemonCenter_2F/map.json | 95 + .../RustboroCity_PokemonSchool/events.inc | 23 - .../RustboroCity_PokemonSchool/header.inc | 15 - data/maps/RustboroCity_PokemonSchool/map.json | 168 + data/maps/RusturfTunnel/events.inc | 27 - data/maps/RusturfTunnel/header.inc | 15 - data/maps/RusturfTunnel/map.json | 219 + data/maps/SSTidalCorridor/events.inc | 35 - data/maps/SSTidalCorridor/header.inc | 15 - data/maps/SSTidalCorridor/map.json | 247 + data/maps/SSTidalLowerDeck/events.inc | 13 - data/maps/SSTidalLowerDeck/header.inc | 15 - data/maps/SSTidalLowerDeck/map.json | 64 + data/maps/SSTidalRooms/events.inc | 31 - data/maps/SSTidalRooms/header.inc | 15 - data/maps/SSTidalRooms/map.json | 227 + data/maps/SafariZone_North/connections.inc | 9 - data/maps/SafariZone_North/events.inc | 14 - data/maps/SafariZone_North/header.inc | 15 - data/maps/SafariZone_North/map.json | 154 + .../maps/SafariZone_Northeast/connections.inc | 8 - data/maps/SafariZone_Northeast/events.inc | 18 - data/maps/SafariZone_Northeast/header.inc | 15 - data/maps/SafariZone_Northeast/map.json | 166 + .../maps/SafariZone_Northwest/connections.inc | 8 - data/maps/SafariZone_Northwest/events.inc | 7 - data/maps/SafariZone_Northwest/header.inc | 15 - data/maps/SafariZone_Northwest/map.json | 58 + data/maps/SafariZone_RestHouse/events.inc | 12 - data/maps/SafariZone_RestHouse/header.inc | 15 - data/maps/SafariZone_RestHouse/map.json | 75 + data/maps/SafariZone_South/connections.inc | 9 - data/maps/SafariZone_South/events.inc | 14 - data/maps/SafariZone_South/header.inc | 15 - data/maps/SafariZone_South/map.json | 123 + .../maps/SafariZone_Southeast/connections.inc | 8 - data/maps/SafariZone_Southeast/events.inc | 14 - data/maps/SafariZone_Southeast/header.inc | 15 - data/maps/SafariZone_Southeast/map.json | 114 + .../maps/SafariZone_Southwest/connections.inc | 8 - data/maps/SafariZone_Southwest/events.inc | 13 - data/maps/SafariZone_Southwest/header.inc | 15 - data/maps/SafariZone_Southwest/map.json | 75 + data/maps/ScorchedSlab/events.inc | 9 - data/maps/ScorchedSlab/header.inc | 15 - data/maps/ScorchedSlab/map.json | 42 + data/maps/SeafloorCavern_Entrance/events.inc | 10 - data/maps/SeafloorCavern_Entrance/header.inc | 15 - data/maps/SeafloorCavern_Entrance/map.json | 49 + data/maps/SeafloorCavern_Room1/events.inc | 15 - data/maps/SeafloorCavern_Room1/header.inc | 15 - data/maps/SeafloorCavern_Room1/map.json | 108 + data/maps/SeafloorCavern_Room2/events.inc | 19 - data/maps/SeafloorCavern_Room2/header.inc | 15 - data/maps/SeafloorCavern_Room2/map.json | 154 + data/maps/SeafloorCavern_Room3/events.inc | 19 - data/maps/SeafloorCavern_Room3/header.inc | 15 - data/maps/SeafloorCavern_Room3/map.json | 160 + data/maps/SeafloorCavern_Room4/events.inc | 13 - data/maps/SeafloorCavern_Room4/header.inc | 15 - data/maps/SeafloorCavern_Room4/map.json | 76 + data/maps/SeafloorCavern_Room5/events.inc | 16 - data/maps/SeafloorCavern_Room5/header.inc | 15 - data/maps/SeafloorCavern_Room5/map.json | 121 + data/maps/SeafloorCavern_Room6/events.inc | 8 - data/maps/SeafloorCavern_Room6/header.inc | 15 - data/maps/SeafloorCavern_Room6/map.json | 42 + data/maps/SeafloorCavern_Room7/events.inc | 7 - data/maps/SeafloorCavern_Room7/header.inc | 15 - data/maps/SeafloorCavern_Room7/map.json | 35 + data/maps/SeafloorCavern_Room8/events.inc | 21 - data/maps/SeafloorCavern_Room8/header.inc | 15 - data/maps/SeafloorCavern_Room8/map.json | 192 + data/maps/SeafloorCavern_Room9/events.inc | 18 - data/maps/SeafloorCavern_Room9/header.inc | 15 - data/maps/SeafloorCavern_Room9/map.json | 130 + data/maps/SealedChamber_InnerRoom/events.inc | 17 - data/maps/SealedChamber_InnerRoom/header.inc | 15 - data/maps/SealedChamber_InnerRoom/map.json | 101 + data/maps/SealedChamber_OuterRoom/events.inc | 37 - data/maps/SealedChamber_OuterRoom/header.inc | 15 - data/maps/SealedChamber_OuterRoom/map.json | 261 + data/maps/SecretBase_BlueCave1/events.inc | 23 - data/maps/SecretBase_BlueCave1/header.inc | 15 - data/maps/SecretBase_BlueCave1/map.json | 224 + data/maps/SecretBase_BlueCave2/events.inc | 23 - data/maps/SecretBase_BlueCave2/header.inc | 15 - data/maps/SecretBase_BlueCave2/map.json | 224 + data/maps/SecretBase_BlueCave3/events.inc | 23 - data/maps/SecretBase_BlueCave3/header.inc | 15 - data/maps/SecretBase_BlueCave3/map.json | 224 + data/maps/SecretBase_BlueCave4/events.inc | 23 - data/maps/SecretBase_BlueCave4/header.inc | 15 - data/maps/SecretBase_BlueCave4/map.json | 224 + data/maps/SecretBase_BrownCave1/events.inc | 23 - data/maps/SecretBase_BrownCave1/header.inc | 15 - data/maps/SecretBase_BrownCave1/map.json | 224 + data/maps/SecretBase_BrownCave2/events.inc | 23 - data/maps/SecretBase_BrownCave2/header.inc | 15 - data/maps/SecretBase_BrownCave2/map.json | 224 + data/maps/SecretBase_BrownCave3/events.inc | 23 - data/maps/SecretBase_BrownCave3/header.inc | 15 - data/maps/SecretBase_BrownCave3/map.json | 224 + data/maps/SecretBase_BrownCave4/events.inc | 23 - data/maps/SecretBase_BrownCave4/header.inc | 15 - data/maps/SecretBase_BrownCave4/map.json | 224 + data/maps/SecretBase_RedCave1/events.inc | 23 - data/maps/SecretBase_RedCave1/header.inc | 15 - data/maps/SecretBase_RedCave1/map.json | 224 + data/maps/SecretBase_RedCave2/events.inc | 23 - data/maps/SecretBase_RedCave2/header.inc | 15 - data/maps/SecretBase_RedCave2/map.json | 224 + data/maps/SecretBase_RedCave3/events.inc | 23 - data/maps/SecretBase_RedCave3/header.inc | 15 - data/maps/SecretBase_RedCave3/map.json | 224 + data/maps/SecretBase_RedCave4/events.inc | 23 - data/maps/SecretBase_RedCave4/header.inc | 15 - data/maps/SecretBase_RedCave4/map.json | 224 + data/maps/SecretBase_Shrub1/events.inc | 23 - data/maps/SecretBase_Shrub1/header.inc | 15 - data/maps/SecretBase_Shrub1/map.json | 224 + data/maps/SecretBase_Shrub2/events.inc | 23 - data/maps/SecretBase_Shrub2/header.inc | 15 - data/maps/SecretBase_Shrub2/map.json | 224 + data/maps/SecretBase_Shrub3/events.inc | 23 - data/maps/SecretBase_Shrub3/header.inc | 15 - data/maps/SecretBase_Shrub3/map.json | 224 + data/maps/SecretBase_Shrub4/events.inc | 23 - data/maps/SecretBase_Shrub4/header.inc | 15 - data/maps/SecretBase_Shrub4/map.json | 224 + data/maps/SecretBase_Tree1/events.inc | 23 - data/maps/SecretBase_Tree1/header.inc | 15 - data/maps/SecretBase_Tree1/map.json | 224 + data/maps/SecretBase_Tree2/events.inc | 23 - data/maps/SecretBase_Tree2/header.inc | 15 - data/maps/SecretBase_Tree2/map.json | 224 + data/maps/SecretBase_Tree3/events.inc | 23 - data/maps/SecretBase_Tree3/header.inc | 15 - data/maps/SecretBase_Tree3/map.json | 224 + data/maps/SecretBase_Tree4/events.inc | 23 - data/maps/SecretBase_Tree4/header.inc | 15 - data/maps/SecretBase_Tree4/map.json | 224 + data/maps/SecretBase_YellowCave1/events.inc | 23 - data/maps/SecretBase_YellowCave1/header.inc | 15 - data/maps/SecretBase_YellowCave1/map.json | 224 + data/maps/SecretBase_YellowCave2/events.inc | 23 - data/maps/SecretBase_YellowCave2/header.inc | 15 - data/maps/SecretBase_YellowCave2/map.json | 224 + data/maps/SecretBase_YellowCave3/events.inc | 23 - data/maps/SecretBase_YellowCave3/header.inc | 15 - data/maps/SecretBase_YellowCave3/map.json | 224 + data/maps/SecretBase_YellowCave4/events.inc | 23 - data/maps/SecretBase_YellowCave4/header.inc | 15 - data/maps/SecretBase_YellowCave4/map.json | 224 + .../ShoalCave_HighTideEntranceRoom/events.inc | 3 - .../ShoalCave_HighTideEntranceRoom/header.inc | 15 - .../ShoalCave_HighTideEntranceRoom/map.json | 20 + .../ShoalCave_HighTideInnerRoom/events.inc | 3 - .../ShoalCave_HighTideInnerRoom/header.inc | 15 - .../maps/ShoalCave_HighTideInnerRoom/map.json | 20 + .../ShoalCave_LowTideEntranceRoom/events.inc | 13 - .../ShoalCave_LowTideEntranceRoom/header.inc | 15 - .../ShoalCave_LowTideEntranceRoom/map.json | 76 + .../ShoalCave_LowTideEntranceRoom/scripts.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 10 - data/maps/ShoalCave_LowTideIceRoom/header.inc | 15 - data/maps/ShoalCave_LowTideIceRoom/map.json | 55 + .../ShoalCave_LowTideInnerRoom/events.inc | 24 - .../ShoalCave_LowTideInnerRoom/header.inc | 15 - data/maps/ShoalCave_LowTideInnerRoom/map.json | 140 + .../ShoalCave_LowTideInnerRoom/scripts.inc | 4 +- .../ShoalCave_LowTideLowerRoom/events.inc | 16 - .../ShoalCave_LowTideLowerRoom/header.inc | 15 - data/maps/ShoalCave_LowTideLowerRoom/map.json | 85 + .../ShoalCave_LowTideStairsRoom/events.inc | 13 - .../ShoalCave_LowTideStairsRoom/header.inc | 15 - .../maps/ShoalCave_LowTideStairsRoom/map.json | 58 + data/maps/SingleBattleColosseum/events.inc | 14 - data/maps/SingleBattleColosseum/header.inc | 15 - data/maps/SingleBattleColosseum/map.json | 68 + data/maps/SkyPillar_1F/events.inc | 8 - data/maps/SkyPillar_1F/header.inc | 15 - data/maps/SkyPillar_1F/map.json | 42 + data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/events.inc | 7 - data/maps/SkyPillar_2F/header.inc | 15 - data/maps/SkyPillar_2F/map.json | 35 + data/maps/SkyPillar_2F/scripts.inc | 2 +- data/maps/SkyPillar_3F/events.inc | 8 - data/maps/SkyPillar_3F/header.inc | 15 - data/maps/SkyPillar_3F/map.json | 42 + data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/events.inc | 8 - data/maps/SkyPillar_4F/header.inc | 15 - data/maps/SkyPillar_4F/map.json | 42 + data/maps/SkyPillar_4F/scripts.inc | 2 +- data/maps/SkyPillar_5F/events.inc | 7 - data/maps/SkyPillar_5F/header.inc | 15 - data/maps/SkyPillar_5F/map.json | 35 + data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Entrance/events.inc | 7 - data/maps/SkyPillar_Entrance/header.inc | 15 - data/maps/SkyPillar_Entrance/map.json | 35 + data/maps/SkyPillar_Outside/events.inc | 10 - data/maps/SkyPillar_Outside/header.inc | 15 - data/maps/SkyPillar_Outside/map.json | 49 + data/maps/SkyPillar_Top/events.inc | 13 - data/maps/SkyPillar_Top/header.inc | 15 - data/maps/SkyPillar_Top/map.json | 65 + data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SlateportCity/connections.inc | 9 - data/maps/SlateportCity/events.inc | 71 - data/maps/SlateportCity/header.inc | 15 - data/maps/SlateportCity/map.json | 685 +++ .../events.inc | 8 - .../header.inc | 15 - .../map.json | 60 + .../events.inc | 6 - .../header.inc | 15 - .../SlateportCity_BattleTentCorridor/map.json | 34 + .../SlateportCity_BattleTentLobby/events.inc | 17 - .../SlateportCity_BattleTentLobby/header.inc | 15 - .../SlateportCity_BattleTentLobby/map.json | 110 + data/maps/SlateportCity_Harbor/events.inc | 25 - data/maps/SlateportCity_Harbor/header.inc | 15 - data/maps/SlateportCity_Harbor/map.json | 191 + data/maps/SlateportCity_House1/events.inc | 10 - data/maps/SlateportCity_House1/header.inc | 15 - data/maps/SlateportCity_House1/map.json | 49 + data/maps/SlateportCity_House2/events.inc | 11 - data/maps/SlateportCity_House2/header.inc | 15 - data/maps/SlateportCity_House2/map.json | 62 + data/maps/SlateportCity_Mart/events.inc | 12 - data/maps/SlateportCity_Mart/header.inc | 15 - data/maps/SlateportCity_Mart/map.json | 75 + .../SlateportCity_OceanicMuseum_1F/events.inc | 43 - .../SlateportCity_OceanicMuseum_1F/header.inc | 15 - .../SlateportCity_OceanicMuseum_1F/map.json | 349 ++ .../SlateportCity_OceanicMuseum_2F/events.inc | 38 - .../SlateportCity_OceanicMuseum_2F/header.inc | 15 - .../SlateportCity_OceanicMuseum_2F/map.json | 289 ++ .../SlateportCity_PokemonCenter_1F/events.inc | 13 - .../SlateportCity_PokemonCenter_1F/header.inc | 15 - .../SlateportCity_PokemonCenter_1F/map.json | 82 + .../SlateportCity_PokemonCenter_2F/events.inc | 14 - .../SlateportCity_PokemonCenter_2F/header.inc | 15 - .../SlateportCity_PokemonCenter_2F/map.json | 95 + .../SlateportCity_PokemonFanClub/events.inc | 18 - .../SlateportCity_PokemonFanClub/header.inc | 15 - .../SlateportCity_PokemonFanClub/map.json | 153 + .../events.inc | 14 - .../header.inc | 15 - .../SlateportCity_SternsShipyard_1F/map.json | 95 + .../events.inc | 11 - .../header.inc | 15 - .../SlateportCity_SternsShipyard_2F/map.json | 68 + data/maps/SootopolisCity/connections.inc | 6 - data/maps/SootopolisCity/events.inc | 46 - data/maps/SootopolisCity/header.inc | 15 - data/maps/SootopolisCity/map.json | 396 ++ data/maps/SootopolisCity/scripts.inc | 2 +- data/maps/SootopolisCity_Gym_1F/events.inc | 16 - data/maps/SootopolisCity_Gym_1F/header.inc | 15 - data/maps/SootopolisCity_Gym_1F/map.json | 86 + data/maps/SootopolisCity_Gym_B1F/events.inc | 18 - data/maps/SootopolisCity_Gym_B1F/header.inc | 15 - data/maps/SootopolisCity_Gym_B1F/map.json | 159 + data/maps/SootopolisCity_House1/events.inc | 11 - data/maps/SootopolisCity_House1/header.inc | 15 - data/maps/SootopolisCity_House1/map.json | 62 + data/maps/SootopolisCity_House2/events.inc | 10 - data/maps/SootopolisCity_House2/header.inc | 15 - data/maps/SootopolisCity_House2/map.json | 49 + data/maps/SootopolisCity_House3/events.inc | 11 - data/maps/SootopolisCity_House3/header.inc | 15 - data/maps/SootopolisCity_House3/map.json | 62 + data/maps/SootopolisCity_House4/events.inc | 12 - data/maps/SootopolisCity_House4/header.inc | 15 - data/maps/SootopolisCity_House4/map.json | 75 + data/maps/SootopolisCity_House5/events.inc | 11 - data/maps/SootopolisCity_House5/header.inc | 15 - data/maps/SootopolisCity_House5/map.json | 62 + data/maps/SootopolisCity_House6/events.inc | 10 - data/maps/SootopolisCity_House6/header.inc | 15 - data/maps/SootopolisCity_House6/map.json | 49 + data/maps/SootopolisCity_House7/events.inc | 11 - data/maps/SootopolisCity_House7/header.inc | 15 - data/maps/SootopolisCity_House7/map.json | 62 + .../events.inc | 15 - .../header.inc | 15 - .../map.json | 79 + data/maps/SootopolisCity_Mart/events.inc | 12 - data/maps/SootopolisCity_Mart/header.inc | 15 - data/maps/SootopolisCity_Mart/map.json | 75 + .../events.inc | 11 - .../header.inc | 15 - .../map.json | 56 + .../scripts.inc | 2 +- .../events.inc | 9 - .../header.inc | 15 - .../map.json | 42 + .../events.inc | 14 - .../header.inc | 15 - .../SootopolisCity_PokemonCenter_1F/map.json | 95 + .../events.inc | 14 - .../header.inc | 15 - .../SootopolisCity_PokemonCenter_2F/map.json | 95 + data/maps/SouthernIsland_Exterior/events.inc | 14 - data/maps/SouthernIsland_Exterior/header.inc | 15 - data/maps/SouthernIsland_Exterior/map.json | 71 + data/maps/SouthernIsland_Interior/events.inc | 14 - data/maps/SouthernIsland_Interior/header.inc | 15 - data/maps/SouthernIsland_Interior/map.json | 71 + data/maps/TerraCave_End/events.inc | 12 - data/maps/TerraCave_End/header.inc | 15 - data/maps/TerraCave_End/map.json | 52 + data/maps/TerraCave_Entrance/events.inc | 7 - data/maps/TerraCave_Entrance/header.inc | 15 - data/maps/TerraCave_Entrance/map.json | 35 + data/maps/TradeCenter/events.inc | 14 - data/maps/TradeCenter/header.inc | 15 - data/maps/TradeCenter/map.json | 68 + data/maps/TrainerHill_1F/events.inc | 7 - data/maps/TrainerHill_1F/header.inc | 15 - data/maps/TrainerHill_1F/map.json | 35 + data/maps/TrainerHill_2F/events.inc | 7 - data/maps/TrainerHill_2F/header.inc | 15 - data/maps/TrainerHill_2F/map.json | 35 + data/maps/TrainerHill_3F/events.inc | 7 - data/maps/TrainerHill_3F/header.inc | 15 - data/maps/TrainerHill_3F/map.json | 35 + data/maps/TrainerHill_4F/events.inc | 7 - data/maps/TrainerHill_4F/header.inc | 15 - data/maps/TrainerHill_4F/map.json | 35 + data/maps/TrainerHill_Elevator/events.inc | 10 - data/maps/TrainerHill_Elevator/header.inc | 15 - data/maps/TrainerHill_Elevator/map.json | 49 + data/maps/TrainerHill_Entrance/events.inc | 21 - data/maps/TrainerHill_Entrance/header.inc | 15 - data/maps/TrainerHill_Entrance/map.json | 127 + data/maps/TrainerHill_Roof/events.inc | 10 - data/maps/TrainerHill_Roof/header.inc | 15 - data/maps/TrainerHill_Roof/map.json | 49 + data/maps/Underwater1/connections.inc | 8 - data/maps/Underwater1/events.inc | 12 - data/maps/Underwater1/header.inc | 15 - data/maps/Underwater1/map.json | 88 + data/maps/Underwater2/connections.inc | 9 - data/maps/Underwater2/events.inc | 16 - data/maps/Underwater2/header.inc | 15 - data/maps/Underwater2/map.json | 109 + data/maps/Underwater3/connections.inc | 9 - data/maps/Underwater3/events.inc | 13 - data/maps/Underwater3/header.inc | 15 - data/maps/Underwater3/map.json | 84 + data/maps/Underwater4/connections.inc | 8 - data/maps/Underwater4/events.inc | 10 - data/maps/Underwater4/header.inc | 15 - data/maps/Underwater4/map.json | 56 + data/maps/Underwater5/connections.inc | 7 - data/maps/Underwater5/events.inc | 7 - data/maps/Underwater5/header.inc | 15 - data/maps/Underwater5/map.json | 41 + data/maps/Underwater6/connections.inc | 7 - data/maps/Underwater6/events.inc | 7 - data/maps/Underwater6/header.inc | 15 - data/maps/Underwater6/map.json | 41 + data/maps/Underwater7/connections.inc | 7 - data/maps/Underwater7/events.inc | 7 - data/maps/Underwater7/header.inc | 15 - data/maps/Underwater7/map.json | 41 + data/maps/Underwater_MarineCave/events.inc | 6 - data/maps/Underwater_MarineCave/header.inc | 15 - data/maps/Underwater_MarineCave/map.json | 28 + data/maps/Underwater_Route134/events.inc | 6 - data/maps/Underwater_Route134/header.inc | 15 - data/maps/Underwater_Route134/map.json | 28 + .../maps/Underwater_SeafloorCavern/events.inc | 12 - .../maps/Underwater_SeafloorCavern/header.inc | 15 - data/maps/Underwater_SeafloorCavern/map.json | 81 + data/maps/Underwater_SealedChamber/events.inc | 9 - data/maps/Underwater_SealedChamber/header.inc | 15 - data/maps/Underwater_SealedChamber/map.json | 37 + .../maps/Underwater_SootopolisCity/events.inc | 7 - .../maps/Underwater_SootopolisCity/header.inc | 15 - data/maps/Underwater_SootopolisCity/map.json | 35 + data/maps/UnionRoom/events.inc | 18 - data/maps/UnionRoom/header.inc | 15 - data/maps/UnionRoom/map.json | 153 + data/maps/UnknownMap_25_29/events.inc | 1 - data/maps/UnknownMap_25_29/header.inc | 15 - data/maps/UnknownMap_25_29/map.json | 18 + data/maps/UnknownMap_25_30/events.inc | 1 - data/maps/UnknownMap_25_30/header.inc | 15 - data/maps/UnknownMap_25_30/map.json | 18 + data/maps/UnknownMap_25_31/events.inc | 1 - data/maps/UnknownMap_25_31/header.inc | 15 - data/maps/UnknownMap_25_31/map.json | 18 + data/maps/UnknownMap_25_32/events.inc | 1 - data/maps/UnknownMap_25_32/header.inc | 15 - data/maps/UnknownMap_25_32/map.json | 18 + data/maps/UnknownMap_25_33/events.inc | 1 - data/maps/UnknownMap_25_33/header.inc | 15 - data/maps/UnknownMap_25_33/map.json | 18 + data/maps/UnknownMap_25_34/events.inc | 1 - data/maps/UnknownMap_25_34/header.inc | 15 - data/maps/UnknownMap_25_34/map.json | 18 + data/maps/VerdanturfTown/connections.inc | 8 - data/maps/VerdanturfTown/events.inc | 28 - data/maps/VerdanturfTown/header.inc | 15 - data/maps/VerdanturfTown/map.json | 199 + .../events.inc | 8 - .../header.inc | 15 - .../map.json | 60 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../VerdanturfTown_BattleTentLobby/events.inc | 18 - .../VerdanturfTown_BattleTentLobby/header.inc | 15 - .../VerdanturfTown_BattleTentLobby/map.json | 123 + .../events.inc | 11 - .../header.inc | 15 - .../map.json | 62 + data/maps/VerdanturfTown_House/events.inc | 11 - data/maps/VerdanturfTown_House/header.inc | 15 - data/maps/VerdanturfTown_House/map.json | 62 + data/maps/VerdanturfTown_Mart/events.inc | 13 - data/maps/VerdanturfTown_Mart/header.inc | 15 - data/maps/VerdanturfTown_Mart/map.json | 88 + .../events.inc | 14 - .../header.inc | 15 - .../VerdanturfTown_PokemonCenter_1F/map.json | 95 + .../events.inc | 14 - .../header.inc | 15 - .../VerdanturfTown_PokemonCenter_2F/map.json | 95 + .../VerdanturfTown_WandasHouse/events.inc | 14 - .../VerdanturfTown_WandasHouse/header.inc | 15 - data/maps/VerdanturfTown_WandasHouse/map.json | 101 + data/maps/VictoryRoad_1F/events.inc | 28 - data/maps/VictoryRoad_1F/header.inc | 15 - data/maps/VictoryRoad_1F/map.json | 202 + data/maps/VictoryRoad_B1F/events.inc | 35 - data/maps/VictoryRoad_B1F/header.inc | 15 - data/maps/VictoryRoad_B1F/map.json | 344 ++ data/maps/VictoryRoad_B2F/events.inc | 22 - data/maps/VictoryRoad_B2F/header.inc | 15 - data/maps/VictoryRoad_B2F/map.json | 158 + data/maps/connections.inc | 65 - data/maps/groups.inc | 623 --- data/maps/headers.inc | 518 -- data/maps/map_groups.json | 691 +++ include/constants/layouts.h | 2 +- include/constants/map_groups.h | 592 +++ include/constants/maps.h | 589 +-- map_data_rules.mk | 31 + src/battle_factory.c | 4 +- src/battle_pike.c | 7 +- src/battle_pyramid.c | 8 +- src/battle_tent.c | 5 +- src/map_name_popup.c | 7 +- src/overworld.c | 9 +- src/pokemon.c | 3 +- src/trainer_hill.c | 27 +- src/tv.c | 9 +- src/wild_encounter.c | 20 +- tools/mapjson/mapjson.py | 389 ++ 2102 files changed, 72595 insertions(+), 27039 deletions(-) delete mode 100755 data/layouts.inc create mode 100755 data/layouts/.gitignore delete mode 100644 data/layouts/AbandonedShip_CaptainsOffice/layout.inc delete mode 100644 data/layouts/AbandonedShip_Corridors_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Corridors_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Deck/layout.inc delete mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc delete mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc delete mode 100644 data/layouts/AbandonedShip_Room_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms2_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Underwater1/layout.inc delete mode 100644 data/layouts/AbandonedShip_Underwater2/layout.inc delete mode 100644 data/layouts/AlteringCave/layout.inc delete mode 100644 data/layouts/AncientTomb/layout.inc delete mode 100644 data/layouts/AquaHideout_1F/layout.inc delete mode 100644 data/layouts/AquaHideout_B1F/layout.inc delete mode 100644 data/layouts/AquaHideout_B2F/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/layout.inc delete mode 100644 data/layouts/ArtisanCave_1F/layout.inc delete mode 100644 data/layouts/ArtisanCave_B1F/layout.inc delete mode 100644 data/layouts/BattleElevator/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_Lounge1/layout.inc delete mode 100644 data/layouts/BattleFrontier_Lounge2/layout.inc delete mode 100644 data/layouts/BattleFrontier_OutsideEast/layout.inc delete mode 100644 data/layouts/BattleFrontier_OutsideWest/layout.inc delete mode 100644 data/layouts/BattleFrontier_RankingHall/layout.inc delete mode 100644 data/layouts/BattleFrontier_ReceptionGate/layout.inc delete mode 100644 data/layouts/BattleFrontier_ScottsHouse/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare01/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare02/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare03/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare04/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare05/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare06/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare07/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare08/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare09/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare10/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare11/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare12/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare13/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare14/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare15/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare16/layout.inc delete mode 100644 data/layouts/BattleTentBattleRoom/layout.inc delete mode 100644 data/layouts/BattleTentCorridor/layout.inc delete mode 100644 data/layouts/BattleTentLobby/layout.inc delete mode 100644 data/layouts/BirthIsland_Exterior/layout.inc delete mode 100644 data/layouts/CableCarStation/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_1F/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_B1F/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_Entrance/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc delete mode 100644 data/layouts/DesertRuins/layout.inc delete mode 100644 data/layouts/DesertUnderpass/layout.inc delete mode 100644 data/layouts/DewfordTown/layout.inc delete mode 100644 data/layouts/DewfordTown_Gym/layout.inc delete mode 100644 data/layouts/DewfordTown_Hall/layout.inc delete mode 100644 data/layouts/DoubleBattleColosseum/layout.inc delete mode 100644 data/layouts/EverGrandeCity/layout.inc delete mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_DrakesRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_Hall4/layout.inc delete mode 100644 data/layouts/EverGrandeCity_HallOfFame/layout.inc delete mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc delete mode 100644 data/layouts/EverGrandeCity_ShortHall/layout.inc delete mode 100644 data/layouts/EverGrandeCity_SidneysRoom/layout.inc delete mode 100644 data/layouts/FallarborTown/layout.inc delete mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc delete mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc delete mode 100644 data/layouts/FarawayIsland_Entrance/layout.inc delete mode 100644 data/layouts/FarawayIsland_Interior/layout.inc delete mode 100644 data/layouts/FieryPath/layout.inc delete mode 100644 data/layouts/FortreeCity/layout.inc delete mode 100644 data/layouts/FortreeCity_DecorationShop/layout.inc delete mode 100644 data/layouts/FortreeCity_Gym/layout.inc delete mode 100644 data/layouts/FortreeCity_House1/layout.inc delete mode 100644 data/layouts/FortreeCity_House2/layout.inc delete mode 100644 data/layouts/GraniteCave_1F/layout.inc delete mode 100644 data/layouts/GraniteCave_B1F/layout.inc delete mode 100644 data/layouts/GraniteCave_B2F/layout.inc delete mode 100644 data/layouts/GraniteCave_StevensRoom/layout.inc delete mode 100644 data/layouts/Harbor/layout.inc delete mode 100644 data/layouts/House1/layout.inc delete mode 100644 data/layouts/House2/layout.inc delete mode 100644 data/layouts/House3/layout.inc delete mode 100644 data/layouts/House4/layout.inc delete mode 100644 data/layouts/HouseWithBed/layout.inc delete mode 100644 data/layouts/InsideOfTruck/layout.inc delete mode 100644 data/layouts/IslandCave/layout.inc delete mode 100644 data/layouts/IslandHarbor/layout.inc delete mode 100644 data/layouts/JaggedPass/layout.inc delete mode 100644 data/layouts/LavaridgeTown/layout.inc delete mode 100644 data/layouts/LavaridgeTown_Gym_1F/layout.inc delete mode 100644 data/layouts/LavaridgeTown_Gym_B1F/layout.inc delete mode 100644 data/layouts/LavaridgeTown_HerbShop/layout.inc delete mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity/layout.inc delete mode 100644 data/layouts/LilycoveCity_ContestHall/layout.inc delete mode 100644 data/layouts/LilycoveCity_ContestLobby/layout.inc delete mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc delete mode 100644 data/layouts/LilycoveCity_House2/layout.inc delete mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc delete mode 100644 data/layouts/LinkContestRoom1/layout.inc delete mode 100644 data/layouts/LinkContestRoom2/layout.inc delete mode 100644 data/layouts/LinkContestRoom3/layout.inc delete mode 100644 data/layouts/LinkContestRoom4/layout.inc delete mode 100644 data/layouts/LinkContestRoom5/layout.inc delete mode 100644 data/layouts/LinkContestRoom6/layout.inc delete mode 100644 data/layouts/LittlerootTown/layout.inc delete mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc delete mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc delete mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/layout.inc delete mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/layout.inc delete mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc delete mode 100644 data/layouts/MagmaHideout_1F/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_1R/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_2R/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_3R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_1R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_2R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_3R/layout.inc delete mode 100644 data/layouts/MagmaHideout_4F/layout.inc delete mode 100644 data/layouts/MarineCave_End/layout.inc delete mode 100644 data/layouts/MarineCave_Entrance/layout.inc delete mode 100644 data/layouts/Mart/layout.inc delete mode 100644 data/layouts/MauvilleCity/layout.inc delete mode 100644 data/layouts/MauvilleCity_BikeShop/layout.inc delete mode 100644 data/layouts/MauvilleCity_GameCorner/layout.inc delete mode 100644 data/layouts/MauvilleCity_Gym/layout.inc delete mode 100644 data/layouts/MeteorFalls_1F_1R/layout.inc delete mode 100644 data/layouts/MeteorFalls_1F_2R/layout.inc delete mode 100644 data/layouts/MeteorFalls_B1F_1R/layout.inc delete mode 100644 data/layouts/MeteorFalls_B1F_2R/layout.inc delete mode 100644 data/layouts/MeteorFalls_StevensCave/layout.inc delete mode 100644 data/layouts/MirageTower_1F/layout.inc delete mode 100644 data/layouts/MirageTower_2F/layout.inc delete mode 100644 data/layouts/MirageTower_3F/layout.inc delete mode 100644 data/layouts/MirageTower_4F/layout.inc delete mode 100644 data/layouts/MossdeepCity/layout.inc delete mode 100644 data/layouts/MossdeepCity_GameCorner_1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_Gym/layout.inc delete mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc delete mode 100644 data/layouts/MossdeepCity_StevensHouse/layout.inc delete mode 100644 data/layouts/MtChimney/layout.inc delete mode 100644 data/layouts/MtPyre_1F/layout.inc delete mode 100644 data/layouts/MtPyre_2F/layout.inc delete mode 100644 data/layouts/MtPyre_3F/layout.inc delete mode 100644 data/layouts/MtPyre_4F/layout.inc delete mode 100644 data/layouts/MtPyre_5F/layout.inc delete mode 100644 data/layouts/MtPyre_6F/layout.inc delete mode 100644 data/layouts/MtPyre_Exterior/layout.inc delete mode 100644 data/layouts/MtPyre_Summit/layout.inc delete mode 100644 data/layouts/NavelRock_B1F/layout.inc delete mode 100644 data/layouts/NavelRock_Bottom/layout.inc delete mode 100644 data/layouts/NavelRock_Entrance/layout.inc delete mode 100644 data/layouts/NavelRock_Exterior/layout.inc delete mode 100644 data/layouts/NavelRock_Fork/layout.inc delete mode 100644 data/layouts/NavelRock_LadderRoom1/layout.inc delete mode 100644 data/layouts/NavelRock_LadderRoom2/layout.inc delete mode 100644 data/layouts/NavelRock_Top/layout.inc delete mode 100644 data/layouts/NewMauville_Entrance/layout.inc delete mode 100644 data/layouts/NewMauville_Inside/layout.inc delete mode 100644 data/layouts/OldaleTown/layout.inc delete mode 100644 data/layouts/PacifidlogTown/layout.inc delete mode 100644 data/layouts/PacifidlogTown_House1/layout.inc delete mode 100644 data/layouts/PacifidlogTown_House2/layout.inc delete mode 100644 data/layouts/PetalburgCity/layout.inc delete mode 100644 data/layouts/PetalburgCity_Gym/layout.inc delete mode 100644 data/layouts/PetalburgWoods/layout.inc delete mode 100644 data/layouts/PokemonCenter_1F/layout.inc delete mode 100644 data/layouts/PokemonCenter_2F/layout.inc delete mode 100644 data/layouts/RecordCorner/layout.inc delete mode 100644 data/layouts/Route101/layout.inc delete mode 100644 data/layouts/Route102/layout.inc delete mode 100644 data/layouts/Route103/layout.inc delete mode 100644 data/layouts/Route104/layout.inc delete mode 100644 data/layouts/Route104_MrBrineysHouse/layout.inc delete mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/layout.inc delete mode 100644 data/layouts/Route104_Prototype/layout.inc delete mode 100644 data/layouts/Route105/layout.inc delete mode 100644 data/layouts/Route106/layout.inc delete mode 100644 data/layouts/Route107/layout.inc delete mode 100644 data/layouts/Route108/layout.inc delete mode 100644 data/layouts/Route109/layout.inc delete mode 100644 data/layouts/Route109_SeashoreHouse/layout.inc delete mode 100644 data/layouts/Route110/layout.inc delete mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseCorridor/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseEnd/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseEntrance/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle1/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle2/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle3/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle4/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle5/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle6/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle7/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle8/layout.inc delete mode 100644 data/layouts/Route111/layout.inc delete mode 100644 data/layouts/Route111_NoMirageTower/layout.inc delete mode 100644 data/layouts/Route112/layout.inc delete mode 100644 data/layouts/Route113/layout.inc delete mode 100644 data/layouts/Route114/layout.inc delete mode 100644 data/layouts/Route114_FossilManiacsHouse/layout.inc delete mode 100644 data/layouts/Route114_FossilManiacsTunnel/layout.inc delete mode 100644 data/layouts/Route114_LanettesHouse/layout.inc delete mode 100644 data/layouts/Route115/layout.inc delete mode 100644 data/layouts/Route116/layout.inc delete mode 100644 data/layouts/Route116_TunnelersRestHouse/layout.inc delete mode 100644 data/layouts/Route117/layout.inc delete mode 100644 data/layouts/Route117_PokemonDayCare/layout.inc delete mode 100644 data/layouts/Route118/layout.inc delete mode 100644 data/layouts/Route119/layout.inc delete mode 100644 data/layouts/Route119_WeatherInstitute_1F/layout.inc delete mode 100644 data/layouts/Route119_WeatherInstitute_2F/layout.inc delete mode 100644 data/layouts/Route120/layout.inc delete mode 100644 data/layouts/Route121/layout.inc delete mode 100644 data/layouts/Route121_SafariZoneEntrance/layout.inc delete mode 100644 data/layouts/Route122/layout.inc delete mode 100644 data/layouts/Route123/layout.inc delete mode 100644 data/layouts/Route124/layout.inc delete mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc delete mode 100644 data/layouts/Route125/layout.inc delete mode 100644 data/layouts/Route126/layout.inc delete mode 100644 data/layouts/Route127/layout.inc delete mode 100644 data/layouts/Route128/layout.inc delete mode 100644 data/layouts/Route129/layout.inc delete mode 100644 data/layouts/Route130/layout.inc delete mode 100644 data/layouts/Route131/layout.inc delete mode 100644 data/layouts/Route132/layout.inc delete mode 100644 data/layouts/Route133/layout.inc delete mode 100644 data/layouts/Route134/layout.inc delete mode 100644 data/layouts/RustboroCity/layout.inc delete mode 100644 data/layouts/RustboroCity_CuttersHouse/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_3F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat1_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat1_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_3F/layout.inc delete mode 100644 data/layouts/RustboroCity_Gym/layout.inc delete mode 100644 data/layouts/RustboroCity_House/layout.inc delete mode 100644 data/layouts/RustboroCity_House1/layout.inc delete mode 100644 data/layouts/RustboroCity_PokemonSchool/layout.inc delete mode 100644 data/layouts/RusturfTunnel/layout.inc delete mode 100644 data/layouts/SSTidalCorridor/layout.inc delete mode 100644 data/layouts/SSTidalLowerDeck/layout.inc delete mode 100644 data/layouts/SSTidalRooms/layout.inc delete mode 100644 data/layouts/SafariZone_North/layout.inc delete mode 100644 data/layouts/SafariZone_Northeast/layout.inc delete mode 100644 data/layouts/SafariZone_Northwest/layout.inc delete mode 100644 data/layouts/SafariZone_RestHouse/layout.inc delete mode 100644 data/layouts/SafariZone_South/layout.inc delete mode 100644 data/layouts/SafariZone_Southeast/layout.inc delete mode 100644 data/layouts/SafariZone_Southwest/layout.inc delete mode 100644 data/layouts/ScorchedSlab/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Entrance/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room1/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room2/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room3/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room4/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room5/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room6/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room7/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room8/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room9/layout.inc delete mode 100644 data/layouts/SealedChamber_InnerRoom/layout.inc delete mode 100644 data/layouts/SealedChamber_OuterRoom/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave1/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave2/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave3/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave4/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave1/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave2/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave3/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave4/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave1/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave2/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave3/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave4/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub1/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub2/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub3/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub4/layout.inc delete mode 100644 data/layouts/SecretBase_Tree1/layout.inc delete mode 100644 data/layouts/SecretBase_Tree2/layout.inc delete mode 100644 data/layouts/SecretBase_Tree3/layout.inc delete mode 100644 data/layouts/SecretBase_Tree4/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave1/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave2/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave3/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave4/layout.inc delete mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideIceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/layout.inc delete mode 100644 data/layouts/SingleBattleColosseum/layout.inc delete mode 100644 data/layouts/SkyPillar_1F/layout.inc delete mode 100644 data/layouts/SkyPillar_2F/layout.inc delete mode 100644 data/layouts/SkyPillar_3F/layout.inc delete mode 100644 data/layouts/SkyPillar_4F/layout.inc delete mode 100644 data/layouts/SkyPillar_5F/layout.inc delete mode 100644 data/layouts/SkyPillar_Entrance/layout.inc delete mode 100644 data/layouts/SkyPillar_Outside/layout.inc delete mode 100644 data/layouts/SkyPillar_Top/layout.inc delete mode 100644 data/layouts/SlateportCity/layout.inc delete mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc delete mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc delete mode 100644 data/layouts/SlateportCity_PokemonFanClub/layout.inc delete mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/layout.inc delete mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/layout.inc delete mode 100644 data/layouts/SootopolisCity/layout.inc delete mode 100644 data/layouts/SootopolisCity_Gym_1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_Gym_B1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_House1/layout.inc delete mode 100644 data/layouts/SootopolisCity_House2/layout.inc delete mode 100644 data/layouts/SootopolisCity_House3/layout.inc delete mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc delete mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc delete mode 100644 data/layouts/SouthernIsland_Exterior/layout.inc delete mode 100644 data/layouts/SouthernIsland_Interior/layout.inc delete mode 100644 data/layouts/TerraCave_End/layout.inc delete mode 100644 data/layouts/TerraCave_Entrance/layout.inc delete mode 100644 data/layouts/TradeCenter/layout.inc delete mode 100644 data/layouts/TrainerHill_1F/layout.inc delete mode 100644 data/layouts/TrainerHill_2F/layout.inc delete mode 100644 data/layouts/TrainerHill_3F/layout.inc delete mode 100644 data/layouts/TrainerHill_4F/layout.inc delete mode 100644 data/layouts/TrainerHill_Entrance/layout.inc delete mode 100644 data/layouts/TrainerHill_Roof/layout.inc delete mode 100644 data/layouts/Underwater1/layout.inc delete mode 100644 data/layouts/Underwater2/layout.inc delete mode 100644 data/layouts/Underwater3/layout.inc delete mode 100644 data/layouts/Underwater4/layout.inc delete mode 100644 data/layouts/Underwater5/layout.inc delete mode 100644 data/layouts/Underwater6/layout.inc delete mode 100644 data/layouts/Underwater7/layout.inc delete mode 100644 data/layouts/Underwater_MarineCave/layout.inc delete mode 100644 data/layouts/Underwater_Route134/layout.inc delete mode 100644 data/layouts/Underwater_SeafloorCavern/layout.inc delete mode 100644 data/layouts/Underwater_SealedChamber/layout.inc delete mode 100644 data/layouts/Underwater_SootopolisCity/layout.inc delete mode 100644 data/layouts/UnionRoom/layout.inc delete mode 100644 data/layouts/UnknownMap_08417FC4/layout.inc delete mode 100644 data/layouts/UnknownMap_08428450/layout.inc delete mode 100644 data/layouts/UnknownMap_084294C4/layout.inc delete mode 100644 data/layouts/UnknownMap_084294E8/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E6C0/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E6E4/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E708/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E72C/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E750/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E774/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E798/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E7BC/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E7E0/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E804/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E828/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E84C/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E870/layout.inc delete mode 100755 data/layouts/UnknownMap_0843E894/layout.inc delete mode 100644 data/layouts/UnknownMap_08447028/layout.inc delete mode 100644 data/layouts/UnknownMap_0845A394/layout.inc delete mode 100644 data/layouts/UnknownMap_0845D470/layout.inc delete mode 100644 data/layouts/UnknownMap_0845ECB4/layout.inc delete mode 100644 data/layouts/UnknownMap_08469200/layout.inc delete mode 100644 data/layouts/UnknownMap_084693AC/layout.inc delete mode 100644 data/layouts/UnknownMap_08480DAC/layout.inc delete mode 100644 data/layouts/UnknownMap_08480F54/layout.inc delete mode 100644 data/layouts/UnknownMap_084810FC/layout.inc delete mode 100644 data/layouts/UnknownMap_084812A4/layout.inc delete mode 100644 data/layouts/UnknownMap_0848144C/layout.inc delete mode 100644 data/layouts/UnknownMap_084815F4/layout.inc delete mode 100644 data/layouts/UnknownMap_08481B24/layout.inc delete mode 100644 data/layouts/UnknownMap_08481DBC/layout.inc delete mode 100644 data/layouts/UnknownMap_25_29/layout.inc delete mode 100644 data/layouts/UnknownMap_25_30/layout.inc delete mode 100644 data/layouts/UnknownMap_25_31/layout.inc delete mode 100644 data/layouts/UnknownMap_25_32/layout.inc delete mode 100644 data/layouts/UnknownMap_25_33/layout.inc delete mode 100644 data/layouts/UnknownMap_25_34/layout.inc delete mode 100644 data/layouts/VerdanturfTown/layout.inc delete mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc delete mode 100644 data/layouts/VerdanturfTown_WandasHouse/layout.inc delete mode 100644 data/layouts/VictoryRoad_1F/layout.inc delete mode 100644 data/layouts/VictoryRoad_B1F/layout.inc delete mode 100644 data/layouts/VictoryRoad_B2F/layout.inc create mode 100644 data/layouts/layouts.json delete mode 100644 data/layouts_table.inc create mode 100755 data/maps/.gitignore delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/events.inc delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/header.inc create mode 100644 data/maps/AbandonedShip_CaptainsOffice/map.json delete mode 100644 data/maps/AbandonedShip_Corridors_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Corridors_1F/header.inc create mode 100644 data/maps/AbandonedShip_Corridors_1F/map.json delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Corridors_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Deck/events.inc delete mode 100644 data/maps/AbandonedShip_Deck/header.inc create mode 100644 data/maps/AbandonedShip_Deck/map.json delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/events.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/header.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/map.json delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/events.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/header.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/map.json delete mode 100644 data/maps/AbandonedShip_Room_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Room_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Room_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms2_1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms2_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms_1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms_1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Underwater1/events.inc delete mode 100644 data/maps/AbandonedShip_Underwater1/header.inc create mode 100644 data/maps/AbandonedShip_Underwater1/map.json delete mode 100644 data/maps/AbandonedShip_Underwater2/events.inc delete mode 100644 data/maps/AbandonedShip_Underwater2/header.inc create mode 100644 data/maps/AbandonedShip_Underwater2/map.json delete mode 100644 data/maps/AlteringCave/events.inc delete mode 100644 data/maps/AlteringCave/header.inc create mode 100644 data/maps/AlteringCave/map.json delete mode 100644 data/maps/AncientTomb/events.inc delete mode 100644 data/maps/AncientTomb/header.inc create mode 100644 data/maps/AncientTomb/map.json delete mode 100644 data/maps/AquaHideout_1F/events.inc delete mode 100644 data/maps/AquaHideout_1F/header.inc create mode 100644 data/maps/AquaHideout_1F/map.json delete mode 100644 data/maps/AquaHideout_B1F/events.inc delete mode 100644 data/maps/AquaHideout_B1F/header.inc create mode 100644 data/maps/AquaHideout_B1F/map.json delete mode 100644 data/maps/AquaHideout_B2F/events.inc delete mode 100644 data/maps/AquaHideout_B2F/header.inc create mode 100644 data/maps/AquaHideout_B2F/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap1/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap2/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap3/map.json delete mode 100644 data/maps/ArtisanCave_1F/events.inc delete mode 100644 data/maps/ArtisanCave_1F/header.inc create mode 100644 data/maps/ArtisanCave_1F/map.json delete mode 100644 data/maps/ArtisanCave_B1F/events.inc delete mode 100644 data/maps/ArtisanCave_B1F/header.inc create mode 100644 data/maps/ArtisanCave_B1F/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc create mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidTop/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerElevator/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_Lounge1/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge1/header.inc create mode 100644 data/maps/BattleFrontier_Lounge1/map.json delete mode 100644 data/maps/BattleFrontier_Lounge2/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge2/header.inc create mode 100644 data/maps/BattleFrontier_Lounge2/map.json delete mode 100644 data/maps/BattleFrontier_Lounge3/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge3/header.inc create mode 100644 data/maps/BattleFrontier_Lounge3/map.json delete mode 100644 data/maps/BattleFrontier_Lounge4/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge4/header.inc create mode 100644 data/maps/BattleFrontier_Lounge4/map.json delete mode 100644 data/maps/BattleFrontier_Lounge5/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge5/header.inc create mode 100644 data/maps/BattleFrontier_Lounge5/map.json delete mode 100644 data/maps/BattleFrontier_Lounge6/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge6/header.inc create mode 100644 data/maps/BattleFrontier_Lounge6/map.json delete mode 100644 data/maps/BattleFrontier_Lounge7/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge7/header.inc create mode 100644 data/maps/BattleFrontier_Lounge7/map.json delete mode 100644 data/maps/BattleFrontier_Lounge8/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge8/header.inc create mode 100644 data/maps/BattleFrontier_Lounge8/map.json delete mode 100644 data/maps/BattleFrontier_Lounge9/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge9/header.inc create mode 100644 data/maps/BattleFrontier_Lounge9/map.json delete mode 100644 data/maps/BattleFrontier_Mart/events.inc delete mode 100644 data/maps/BattleFrontier_Mart/header.inc create mode 100644 data/maps/BattleFrontier_Mart/map.json delete mode 100644 data/maps/BattleFrontier_OutsideEast/connections.inc delete mode 100644 data/maps/BattleFrontier_OutsideEast/events.inc delete mode 100644 data/maps/BattleFrontier_OutsideEast/header.inc create mode 100644 data/maps/BattleFrontier_OutsideEast/map.json delete mode 100644 data/maps/BattleFrontier_OutsideWest/connections.inc delete mode 100644 data/maps/BattleFrontier_OutsideWest/events.inc delete mode 100644 data/maps/BattleFrontier_OutsideWest/header.inc create mode 100644 data/maps/BattleFrontier_OutsideWest/map.json delete mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/events.inc delete mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/header.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/map.json delete mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/events.inc delete mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/header.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/map.json delete mode 100644 data/maps/BattleFrontier_RankingHall/events.inc delete mode 100644 data/maps/BattleFrontier_RankingHall/header.inc create mode 100644 data/maps/BattleFrontier_RankingHall/map.json delete mode 100644 data/maps/BattleFrontier_ReceptionGate/events.inc delete mode 100644 data/maps/BattleFrontier_ReceptionGate/header.inc create mode 100644 data/maps/BattleFrontier_ReceptionGate/map.json delete mode 100644 data/maps/BattleFrontier_ScottsHouse/events.inc delete mode 100644 data/maps/BattleFrontier_ScottsHouse/header.inc create mode 100644 data/maps/BattleFrontier_ScottsHouse/map.json delete mode 100644 data/maps/BattlePyramidSquare01/events.inc delete mode 100644 data/maps/BattlePyramidSquare01/header.inc create mode 100644 data/maps/BattlePyramidSquare01/map.json delete mode 100644 data/maps/BattlePyramidSquare02/events.inc delete mode 100644 data/maps/BattlePyramidSquare02/header.inc create mode 100644 data/maps/BattlePyramidSquare02/map.json delete mode 100644 data/maps/BattlePyramidSquare03/events.inc delete mode 100644 data/maps/BattlePyramidSquare03/header.inc create mode 100644 data/maps/BattlePyramidSquare03/map.json delete mode 100644 data/maps/BattlePyramidSquare04/events.inc delete mode 100644 data/maps/BattlePyramidSquare04/header.inc create mode 100644 data/maps/BattlePyramidSquare04/map.json delete mode 100644 data/maps/BattlePyramidSquare05/events.inc delete mode 100644 data/maps/BattlePyramidSquare05/header.inc create mode 100644 data/maps/BattlePyramidSquare05/map.json delete mode 100644 data/maps/BattlePyramidSquare06/events.inc delete mode 100644 data/maps/BattlePyramidSquare06/header.inc create mode 100644 data/maps/BattlePyramidSquare06/map.json delete mode 100644 data/maps/BattlePyramidSquare07/events.inc delete mode 100644 data/maps/BattlePyramidSquare07/header.inc create mode 100644 data/maps/BattlePyramidSquare07/map.json delete mode 100644 data/maps/BattlePyramidSquare08/events.inc delete mode 100644 data/maps/BattlePyramidSquare08/header.inc create mode 100644 data/maps/BattlePyramidSquare08/map.json delete mode 100644 data/maps/BattlePyramidSquare09/events.inc delete mode 100644 data/maps/BattlePyramidSquare09/header.inc create mode 100644 data/maps/BattlePyramidSquare09/map.json delete mode 100644 data/maps/BattlePyramidSquare10/events.inc delete mode 100644 data/maps/BattlePyramidSquare10/header.inc create mode 100644 data/maps/BattlePyramidSquare10/map.json delete mode 100644 data/maps/BattlePyramidSquare11/events.inc delete mode 100644 data/maps/BattlePyramidSquare11/header.inc create mode 100644 data/maps/BattlePyramidSquare11/map.json delete mode 100644 data/maps/BattlePyramidSquare12/events.inc delete mode 100644 data/maps/BattlePyramidSquare12/header.inc create mode 100644 data/maps/BattlePyramidSquare12/map.json delete mode 100644 data/maps/BattlePyramidSquare13/events.inc delete mode 100644 data/maps/BattlePyramidSquare13/header.inc create mode 100644 data/maps/BattlePyramidSquare13/map.json delete mode 100644 data/maps/BattlePyramidSquare14/events.inc delete mode 100644 data/maps/BattlePyramidSquare14/header.inc create mode 100644 data/maps/BattlePyramidSquare14/map.json delete mode 100644 data/maps/BattlePyramidSquare15/events.inc delete mode 100644 data/maps/BattlePyramidSquare15/header.inc create mode 100644 data/maps/BattlePyramidSquare15/map.json delete mode 100644 data/maps/BattlePyramidSquare16/events.inc delete mode 100644 data/maps/BattlePyramidSquare16/header.inc create mode 100644 data/maps/BattlePyramidSquare16/map.json delete mode 100644 data/maps/BirthIsland_Exterior/events.inc delete mode 100644 data/maps/BirthIsland_Exterior/header.inc create mode 100644 data/maps/BirthIsland_Exterior/map.json delete mode 100644 data/maps/BirthIsland_Harbor/events.inc delete mode 100644 data/maps/BirthIsland_Harbor/header.inc create mode 100644 data/maps/BirthIsland_Harbor/map.json delete mode 100644 data/maps/CaveOfOrigin_1F/events.inc delete mode 100644 data/maps/CaveOfOrigin_1F/header.inc create mode 100644 data/maps/CaveOfOrigin_1F/map.json delete mode 100644 data/maps/CaveOfOrigin_B1F/events.inc delete mode 100644 data/maps/CaveOfOrigin_B1F/header.inc create mode 100644 data/maps/CaveOfOrigin_B1F/map.json delete mode 100644 data/maps/CaveOfOrigin_Entrance/events.inc delete mode 100644 data/maps/CaveOfOrigin_Entrance/header.inc create mode 100644 data/maps/CaveOfOrigin_Entrance/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json delete mode 100644 data/maps/DesertRuins/events.inc delete mode 100644 data/maps/DesertRuins/header.inc create mode 100644 data/maps/DesertRuins/map.json delete mode 100644 data/maps/DesertUnderpass/events.inc delete mode 100644 data/maps/DesertUnderpass/header.inc create mode 100644 data/maps/DesertUnderpass/map.json delete mode 100644 data/maps/DewfordTown/connections.inc delete mode 100644 data/maps/DewfordTown/events.inc delete mode 100644 data/maps/DewfordTown/header.inc create mode 100644 data/maps/DewfordTown/map.json delete mode 100644 data/maps/DewfordTown_Gym/events.inc delete mode 100644 data/maps/DewfordTown_Gym/header.inc create mode 100644 data/maps/DewfordTown_Gym/map.json delete mode 100644 data/maps/DewfordTown_Hall/events.inc delete mode 100644 data/maps/DewfordTown_Hall/header.inc create mode 100644 data/maps/DewfordTown_Hall/map.json delete mode 100644 data/maps/DewfordTown_House1/events.inc delete mode 100644 data/maps/DewfordTown_House1/header.inc create mode 100644 data/maps/DewfordTown_House1/map.json delete mode 100644 data/maps/DewfordTown_House2/events.inc delete mode 100644 data/maps/DewfordTown_House2/header.inc create mode 100644 data/maps/DewfordTown_House2/map.json delete mode 100644 data/maps/DewfordTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/DewfordTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/DoubleBattleColosseum/events.inc delete mode 100644 data/maps/DoubleBattleColosseum/header.inc create mode 100644 data/maps/DoubleBattleColosseum/map.json delete mode 100644 data/maps/EverGrandeCity/connections.inc delete mode 100644 data/maps/EverGrandeCity/events.inc delete mode 100644 data/maps/EverGrandeCity/header.inc create mode 100644 data/maps/EverGrandeCity/map.json delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/header.inc create mode 100644 data/maps/EverGrandeCity_ChampionsRoom/map.json delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/header.inc create mode 100644 data/maps/EverGrandeCity_DrakesRoom/map.json delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/header.inc create mode 100644 data/maps/EverGrandeCity_GlaciasRoom/map.json delete mode 100644 data/maps/EverGrandeCity_Hall1/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall1/header.inc create mode 100644 data/maps/EverGrandeCity_Hall1/map.json delete mode 100644 data/maps/EverGrandeCity_Hall2/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall2/header.inc create mode 100644 data/maps/EverGrandeCity_Hall2/map.json delete mode 100644 data/maps/EverGrandeCity_Hall3/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall3/header.inc create mode 100644 data/maps/EverGrandeCity_Hall3/map.json delete mode 100644 data/maps/EverGrandeCity_Hall4/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall4/header.inc create mode 100644 data/maps/EverGrandeCity_Hall4/map.json delete mode 100644 data/maps/EverGrandeCity_Hall5/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall5/header.inc create mode 100644 data/maps/EverGrandeCity_Hall5/map.json delete mode 100644 data/maps/EverGrandeCity_HallOfFame/events.inc delete mode 100644 data/maps/EverGrandeCity_HallOfFame/header.inc create mode 100644 data/maps/EverGrandeCity_HallOfFame/map.json delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/header.inc create mode 100644 data/maps/EverGrandeCity_PhoebesRoom/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/map.json delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/header.inc create mode 100644 data/maps/EverGrandeCity_SidneysRoom/map.json delete mode 100644 data/maps/FallarborTown/connections.inc delete mode 100644 data/maps/FallarborTown/events.inc delete mode 100644 data/maps/FallarborTown/header.inc create mode 100644 data/maps/FallarborTown/map.json delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/header.inc create mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/map.json delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/header.inc create mode 100644 data/maps/FallarborTown_BattleTentCorridor/map.json delete mode 100644 data/maps/FallarborTown_BattleTentLobby/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentLobby/header.inc create mode 100644 data/maps/FallarborTown_BattleTentLobby/map.json delete mode 100644 data/maps/FallarborTown_House1/events.inc delete mode 100644 data/maps/FallarborTown_House1/header.inc create mode 100644 data/maps/FallarborTown_House1/map.json delete mode 100644 data/maps/FallarborTown_House2/events.inc delete mode 100644 data/maps/FallarborTown_House2/header.inc create mode 100644 data/maps/FallarborTown_House2/map.json delete mode 100644 data/maps/FallarborTown_Mart/events.inc delete mode 100644 data/maps/FallarborTown_Mart/header.inc create mode 100644 data/maps/FallarborTown_Mart/map.json delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/FallarborTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/FarawayIsland_Entrance/events.inc delete mode 100644 data/maps/FarawayIsland_Entrance/header.inc create mode 100644 data/maps/FarawayIsland_Entrance/map.json delete mode 100644 data/maps/FarawayIsland_Interior/events.inc delete mode 100644 data/maps/FarawayIsland_Interior/header.inc create mode 100644 data/maps/FarawayIsland_Interior/map.json delete mode 100644 data/maps/FieryPath/events.inc delete mode 100644 data/maps/FieryPath/header.inc create mode 100644 data/maps/FieryPath/map.json delete mode 100644 data/maps/FortreeCity/connections.inc delete mode 100644 data/maps/FortreeCity/events.inc delete mode 100644 data/maps/FortreeCity/header.inc create mode 100644 data/maps/FortreeCity/map.json delete mode 100644 data/maps/FortreeCity_DecorationShop/events.inc delete mode 100644 data/maps/FortreeCity_DecorationShop/header.inc create mode 100644 data/maps/FortreeCity_DecorationShop/map.json delete mode 100644 data/maps/FortreeCity_Gym/events.inc delete mode 100644 data/maps/FortreeCity_Gym/header.inc create mode 100644 data/maps/FortreeCity_Gym/map.json delete mode 100644 data/maps/FortreeCity_House1/events.inc delete mode 100644 data/maps/FortreeCity_House1/header.inc create mode 100644 data/maps/FortreeCity_House1/map.json delete mode 100644 data/maps/FortreeCity_House2/events.inc delete mode 100644 data/maps/FortreeCity_House2/header.inc create mode 100644 data/maps/FortreeCity_House2/map.json delete mode 100644 data/maps/FortreeCity_House3/events.inc delete mode 100644 data/maps/FortreeCity_House3/header.inc create mode 100644 data/maps/FortreeCity_House3/map.json delete mode 100644 data/maps/FortreeCity_House4/events.inc delete mode 100644 data/maps/FortreeCity_House4/header.inc create mode 100644 data/maps/FortreeCity_House4/map.json delete mode 100644 data/maps/FortreeCity_House5/events.inc delete mode 100644 data/maps/FortreeCity_House5/header.inc create mode 100644 data/maps/FortreeCity_House5/map.json delete mode 100644 data/maps/FortreeCity_Mart/events.inc delete mode 100644 data/maps/FortreeCity_Mart/header.inc create mode 100644 data/maps/FortreeCity_Mart/map.json delete mode 100644 data/maps/FortreeCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/FortreeCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/GraniteCave_1F/events.inc delete mode 100644 data/maps/GraniteCave_1F/header.inc create mode 100644 data/maps/GraniteCave_1F/map.json delete mode 100644 data/maps/GraniteCave_B1F/events.inc delete mode 100644 data/maps/GraniteCave_B1F/header.inc create mode 100644 data/maps/GraniteCave_B1F/map.json delete mode 100644 data/maps/GraniteCave_B2F/events.inc delete mode 100644 data/maps/GraniteCave_B2F/header.inc create mode 100644 data/maps/GraniteCave_B2F/map.json delete mode 100644 data/maps/GraniteCave_StevensRoom/events.inc delete mode 100644 data/maps/GraniteCave_StevensRoom/header.inc create mode 100644 data/maps/GraniteCave_StevensRoom/map.json delete mode 100644 data/maps/InsideOfTruck/events.inc delete mode 100644 data/maps/InsideOfTruck/header.inc create mode 100644 data/maps/InsideOfTruck/map.json delete mode 100644 data/maps/IslandCave/events.inc delete mode 100644 data/maps/IslandCave/header.inc create mode 100644 data/maps/IslandCave/map.json delete mode 100644 data/maps/JaggedPass/events.inc delete mode 100644 data/maps/JaggedPass/header.inc create mode 100644 data/maps/JaggedPass/map.json delete mode 100644 data/maps/LavaridgeTown/connections.inc delete mode 100644 data/maps/LavaridgeTown/events.inc delete mode 100644 data/maps/LavaridgeTown/header.inc create mode 100644 data/maps/LavaridgeTown/map.json delete mode 100644 data/maps/LavaridgeTown_Gym_1F/events.inc delete mode 100644 data/maps/LavaridgeTown_Gym_1F/header.inc create mode 100644 data/maps/LavaridgeTown_Gym_1F/map.json delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/events.inc delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/header.inc create mode 100644 data/maps/LavaridgeTown_Gym_B1F/map.json delete mode 100644 data/maps/LavaridgeTown_HerbShop/events.inc delete mode 100644 data/maps/LavaridgeTown_HerbShop/header.inc create mode 100644 data/maps/LavaridgeTown_HerbShop/map.json delete mode 100644 data/maps/LavaridgeTown_House/events.inc delete mode 100644 data/maps/LavaridgeTown_House/header.inc create mode 100644 data/maps/LavaridgeTown_House/map.json delete mode 100644 data/maps/LavaridgeTown_Mart/events.inc delete mode 100644 data/maps/LavaridgeTown_Mart/header.inc create mode 100644 data/maps/LavaridgeTown_Mart/map.json delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/LilycoveCity/connections.inc delete mode 100644 data/maps/LilycoveCity/events.inc delete mode 100644 data/maps/LilycoveCity/header.inc create mode 100644 data/maps/LilycoveCity/map.json delete mode 100644 data/maps/LilycoveCity_ContestHall/events.inc delete mode 100644 data/maps/LilycoveCity_ContestHall/header.inc create mode 100644 data/maps/LilycoveCity_ContestHall/map.json delete mode 100644 data/maps/LilycoveCity_ContestLobby/events.inc delete mode 100644 data/maps/LilycoveCity_ContestLobby/header.inc create mode 100644 data/maps/LilycoveCity_ContestLobby/map.json delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/map.json delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/map.json delete mode 100644 data/maps/LilycoveCity_Harbor/events.inc delete mode 100644 data/maps/LilycoveCity_Harbor/header.inc create mode 100644 data/maps/LilycoveCity_Harbor/map.json delete mode 100644 data/maps/LilycoveCity_House1/events.inc delete mode 100644 data/maps/LilycoveCity_House1/header.inc create mode 100644 data/maps/LilycoveCity_House1/map.json delete mode 100644 data/maps/LilycoveCity_House2/events.inc delete mode 100644 data/maps/LilycoveCity_House2/header.inc create mode 100644 data/maps/LilycoveCity_House2/map.json delete mode 100644 data/maps/LilycoveCity_House3/events.inc delete mode 100644 data/maps/LilycoveCity_House3/header.inc create mode 100644 data/maps/LilycoveCity_House3/map.json delete mode 100644 data/maps/LilycoveCity_House4/events.inc delete mode 100644 data/maps/LilycoveCity_House4/header.inc create mode 100644 data/maps/LilycoveCity_House4/map.json delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/map.json delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/map.json delete mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/events.inc delete mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/header.inc create mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/map.json delete mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc create mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/map.json delete mode 100644 data/maps/LilycoveCity_UnusedMart/events.inc delete mode 100644 data/maps/LilycoveCity_UnusedMart/header.inc create mode 100644 data/maps/LilycoveCity_UnusedMart/map.json delete mode 100644 data/maps/LinkContestRoom1/events.inc delete mode 100644 data/maps/LinkContestRoom1/header.inc create mode 100644 data/maps/LinkContestRoom1/map.json delete mode 100644 data/maps/LinkContestRoom2/events.inc delete mode 100644 data/maps/LinkContestRoom2/header.inc create mode 100644 data/maps/LinkContestRoom2/map.json delete mode 100644 data/maps/LinkContestRoom3/events.inc delete mode 100644 data/maps/LinkContestRoom3/header.inc create mode 100644 data/maps/LinkContestRoom3/map.json delete mode 100644 data/maps/LinkContestRoom4/events.inc delete mode 100644 data/maps/LinkContestRoom4/header.inc create mode 100644 data/maps/LinkContestRoom4/map.json delete mode 100644 data/maps/LinkContestRoom5/events.inc delete mode 100644 data/maps/LinkContestRoom5/header.inc create mode 100644 data/maps/LinkContestRoom5/map.json delete mode 100644 data/maps/LinkContestRoom6/events.inc delete mode 100644 data/maps/LinkContestRoom6/header.inc create mode 100644 data/maps/LinkContestRoom6/map.json delete mode 100644 data/maps/LittlerootTown/connections.inc delete mode 100644 data/maps/LittlerootTown/events.inc delete mode 100644 data/maps/LittlerootTown/header.inc create mode 100644 data/maps/LittlerootTown/map.json delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/events.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/header.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/map.json delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/events.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/header.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/map.json delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/events.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/header.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_1F/map.json delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/events.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/header.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_2F/map.json delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/events.inc delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/header.inc create mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/map.json delete mode 100644 data/maps/MagmaHideout_1F/events.inc delete mode 100644 data/maps/MagmaHideout_1F/header.inc create mode 100644 data/maps/MagmaHideout_1F/map.json delete mode 100644 data/maps/MagmaHideout_2F_1R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_1R/header.inc create mode 100644 data/maps/MagmaHideout_2F_1R/map.json delete mode 100644 data/maps/MagmaHideout_2F_2R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_2R/header.inc create mode 100644 data/maps/MagmaHideout_2F_2R/map.json delete mode 100644 data/maps/MagmaHideout_2F_3R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_3R/header.inc create mode 100644 data/maps/MagmaHideout_2F_3R/map.json delete mode 100644 data/maps/MagmaHideout_3F_1R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_1R/header.inc create mode 100644 data/maps/MagmaHideout_3F_1R/map.json delete mode 100644 data/maps/MagmaHideout_3F_2R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_2R/header.inc create mode 100644 data/maps/MagmaHideout_3F_2R/map.json delete mode 100644 data/maps/MagmaHideout_3F_3R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_3R/header.inc create mode 100644 data/maps/MagmaHideout_3F_3R/map.json delete mode 100644 data/maps/MagmaHideout_4F/events.inc delete mode 100644 data/maps/MagmaHideout_4F/header.inc create mode 100644 data/maps/MagmaHideout_4F/map.json delete mode 100644 data/maps/MarineCave_End/events.inc delete mode 100644 data/maps/MarineCave_End/header.inc create mode 100644 data/maps/MarineCave_End/map.json delete mode 100644 data/maps/MarineCave_Entrance/events.inc delete mode 100644 data/maps/MarineCave_Entrance/header.inc create mode 100644 data/maps/MarineCave_Entrance/map.json delete mode 100644 data/maps/MauvilleCity/connections.inc delete mode 100644 data/maps/MauvilleCity/events.inc delete mode 100644 data/maps/MauvilleCity/header.inc create mode 100644 data/maps/MauvilleCity/map.json delete mode 100644 data/maps/MauvilleCity_BikeShop/events.inc delete mode 100644 data/maps/MauvilleCity_BikeShop/header.inc create mode 100644 data/maps/MauvilleCity_BikeShop/map.json delete mode 100644 data/maps/MauvilleCity_GameCorner/events.inc delete mode 100644 data/maps/MauvilleCity_GameCorner/header.inc create mode 100644 data/maps/MauvilleCity_GameCorner/map.json delete mode 100644 data/maps/MauvilleCity_Gym/events.inc delete mode 100644 data/maps/MauvilleCity_Gym/header.inc create mode 100644 data/maps/MauvilleCity_Gym/map.json delete mode 100644 data/maps/MauvilleCity_House1/events.inc delete mode 100644 data/maps/MauvilleCity_House1/header.inc create mode 100644 data/maps/MauvilleCity_House1/map.json delete mode 100644 data/maps/MauvilleCity_House2/events.inc delete mode 100644 data/maps/MauvilleCity_House2/header.inc create mode 100644 data/maps/MauvilleCity_House2/map.json delete mode 100644 data/maps/MauvilleCity_Mart/events.inc delete mode 100644 data/maps/MauvilleCity_Mart/header.inc create mode 100644 data/maps/MauvilleCity_Mart/map.json delete mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/MeteorFalls_1F_1R/events.inc delete mode 100644 data/maps/MeteorFalls_1F_1R/header.inc create mode 100644 data/maps/MeteorFalls_1F_1R/map.json delete mode 100644 data/maps/MeteorFalls_1F_2R/events.inc delete mode 100644 data/maps/MeteorFalls_1F_2R/header.inc create mode 100644 data/maps/MeteorFalls_1F_2R/map.json delete mode 100644 data/maps/MeteorFalls_B1F_1R/events.inc delete mode 100644 data/maps/MeteorFalls_B1F_1R/header.inc create mode 100644 data/maps/MeteorFalls_B1F_1R/map.json delete mode 100644 data/maps/MeteorFalls_B1F_2R/events.inc delete mode 100644 data/maps/MeteorFalls_B1F_2R/header.inc create mode 100644 data/maps/MeteorFalls_B1F_2R/map.json delete mode 100644 data/maps/MeteorFalls_StevensCave/events.inc delete mode 100644 data/maps/MeteorFalls_StevensCave/header.inc create mode 100644 data/maps/MeteorFalls_StevensCave/map.json delete mode 100644 data/maps/MirageTower_1F/events.inc delete mode 100644 data/maps/MirageTower_1F/header.inc create mode 100644 data/maps/MirageTower_1F/map.json delete mode 100644 data/maps/MirageTower_2F/events.inc delete mode 100644 data/maps/MirageTower_2F/header.inc create mode 100644 data/maps/MirageTower_2F/map.json delete mode 100644 data/maps/MirageTower_3F/events.inc delete mode 100644 data/maps/MirageTower_3F/header.inc create mode 100644 data/maps/MirageTower_3F/map.json delete mode 100644 data/maps/MirageTower_4F/events.inc delete mode 100644 data/maps/MirageTower_4F/header.inc create mode 100644 data/maps/MirageTower_4F/map.json delete mode 100644 data/maps/MossdeepCity/connections.inc delete mode 100644 data/maps/MossdeepCity/events.inc delete mode 100644 data/maps/MossdeepCity/header.inc create mode 100644 data/maps/MossdeepCity/map.json delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/events.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/header.inc create mode 100644 data/maps/MossdeepCity_GameCorner_1F/map.json delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/events.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/header.inc create mode 100644 data/maps/MossdeepCity_GameCorner_B1F/map.json delete mode 100644 data/maps/MossdeepCity_Gym/events.inc delete mode 100644 data/maps/MossdeepCity_Gym/header.inc create mode 100644 data/maps/MossdeepCity_Gym/map.json delete mode 100644 data/maps/MossdeepCity_House1/events.inc delete mode 100644 data/maps/MossdeepCity_House1/header.inc create mode 100644 data/maps/MossdeepCity_House1/map.json delete mode 100644 data/maps/MossdeepCity_House2/events.inc delete mode 100644 data/maps/MossdeepCity_House2/header.inc create mode 100644 data/maps/MossdeepCity_House2/map.json delete mode 100644 data/maps/MossdeepCity_House3/events.inc delete mode 100644 data/maps/MossdeepCity_House3/header.inc create mode 100644 data/maps/MossdeepCity_House3/map.json delete mode 100644 data/maps/MossdeepCity_House4/events.inc delete mode 100644 data/maps/MossdeepCity_House4/header.inc create mode 100644 data/maps/MossdeepCity_House4/map.json delete mode 100644 data/maps/MossdeepCity_Mart/events.inc delete mode 100644 data/maps/MossdeepCity_Mart/header.inc create mode 100644 data/maps/MossdeepCity_Mart/map.json delete mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/events.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/header.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/map.json delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/events.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/header.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/map.json delete mode 100644 data/maps/MossdeepCity_StevensHouse/events.inc delete mode 100644 data/maps/MossdeepCity_StevensHouse/header.inc create mode 100644 data/maps/MossdeepCity_StevensHouse/map.json delete mode 100644 data/maps/MtChimney/events.inc delete mode 100644 data/maps/MtChimney/header.inc create mode 100644 data/maps/MtChimney/map.json delete mode 100644 data/maps/MtChimney_CableCarStation/events.inc delete mode 100644 data/maps/MtChimney_CableCarStation/header.inc create mode 100644 data/maps/MtChimney_CableCarStation/map.json delete mode 100644 data/maps/MtPyre_1F/events.inc delete mode 100644 data/maps/MtPyre_1F/header.inc create mode 100644 data/maps/MtPyre_1F/map.json delete mode 100644 data/maps/MtPyre_2F/events.inc delete mode 100644 data/maps/MtPyre_2F/header.inc create mode 100644 data/maps/MtPyre_2F/map.json delete mode 100644 data/maps/MtPyre_3F/events.inc delete mode 100644 data/maps/MtPyre_3F/header.inc create mode 100644 data/maps/MtPyre_3F/map.json delete mode 100644 data/maps/MtPyre_4F/events.inc delete mode 100644 data/maps/MtPyre_4F/header.inc create mode 100644 data/maps/MtPyre_4F/map.json delete mode 100644 data/maps/MtPyre_5F/events.inc delete mode 100644 data/maps/MtPyre_5F/header.inc create mode 100644 data/maps/MtPyre_5F/map.json delete mode 100644 data/maps/MtPyre_6F/events.inc delete mode 100644 data/maps/MtPyre_6F/header.inc create mode 100644 data/maps/MtPyre_6F/map.json delete mode 100644 data/maps/MtPyre_Exterior/events.inc delete mode 100644 data/maps/MtPyre_Exterior/header.inc create mode 100644 data/maps/MtPyre_Exterior/map.json delete mode 100644 data/maps/MtPyre_Summit/events.inc delete mode 100644 data/maps/MtPyre_Summit/header.inc create mode 100644 data/maps/MtPyre_Summit/map.json delete mode 100644 data/maps/NavelRock_B1F/events.inc delete mode 100644 data/maps/NavelRock_B1F/header.inc create mode 100644 data/maps/NavelRock_B1F/map.json delete mode 100644 data/maps/NavelRock_Bottom/events.inc delete mode 100644 data/maps/NavelRock_Bottom/header.inc create mode 100644 data/maps/NavelRock_Bottom/map.json delete mode 100644 data/maps/NavelRock_Down01/events.inc delete mode 100644 data/maps/NavelRock_Down01/header.inc create mode 100644 data/maps/NavelRock_Down01/map.json delete mode 100644 data/maps/NavelRock_Down02/events.inc delete mode 100644 data/maps/NavelRock_Down02/header.inc create mode 100644 data/maps/NavelRock_Down02/map.json delete mode 100644 data/maps/NavelRock_Down03/events.inc delete mode 100644 data/maps/NavelRock_Down03/header.inc create mode 100644 data/maps/NavelRock_Down03/map.json delete mode 100644 data/maps/NavelRock_Down04/events.inc delete mode 100644 data/maps/NavelRock_Down04/header.inc create mode 100644 data/maps/NavelRock_Down04/map.json delete mode 100644 data/maps/NavelRock_Down05/events.inc delete mode 100644 data/maps/NavelRock_Down05/header.inc create mode 100644 data/maps/NavelRock_Down05/map.json delete mode 100644 data/maps/NavelRock_Down06/events.inc delete mode 100644 data/maps/NavelRock_Down06/header.inc create mode 100644 data/maps/NavelRock_Down06/map.json delete mode 100644 data/maps/NavelRock_Down07/events.inc delete mode 100644 data/maps/NavelRock_Down07/header.inc create mode 100644 data/maps/NavelRock_Down07/map.json delete mode 100644 data/maps/NavelRock_Down08/events.inc delete mode 100644 data/maps/NavelRock_Down08/header.inc create mode 100644 data/maps/NavelRock_Down08/map.json delete mode 100644 data/maps/NavelRock_Down09/events.inc delete mode 100644 data/maps/NavelRock_Down09/header.inc create mode 100644 data/maps/NavelRock_Down09/map.json delete mode 100644 data/maps/NavelRock_Down10/events.inc delete mode 100644 data/maps/NavelRock_Down10/header.inc create mode 100644 data/maps/NavelRock_Down10/map.json delete mode 100644 data/maps/NavelRock_Down11/events.inc delete mode 100644 data/maps/NavelRock_Down11/header.inc create mode 100644 data/maps/NavelRock_Down11/map.json delete mode 100644 data/maps/NavelRock_Entrance/events.inc delete mode 100644 data/maps/NavelRock_Entrance/header.inc create mode 100644 data/maps/NavelRock_Entrance/map.json delete mode 100644 data/maps/NavelRock_Exterior/events.inc delete mode 100644 data/maps/NavelRock_Exterior/header.inc create mode 100644 data/maps/NavelRock_Exterior/map.json delete mode 100644 data/maps/NavelRock_Fork/events.inc delete mode 100644 data/maps/NavelRock_Fork/header.inc create mode 100644 data/maps/NavelRock_Fork/map.json delete mode 100644 data/maps/NavelRock_Harbor/events.inc delete mode 100644 data/maps/NavelRock_Harbor/header.inc create mode 100644 data/maps/NavelRock_Harbor/map.json delete mode 100644 data/maps/NavelRock_Top/events.inc delete mode 100644 data/maps/NavelRock_Top/header.inc create mode 100644 data/maps/NavelRock_Top/map.json delete mode 100644 data/maps/NavelRock_Up1/events.inc delete mode 100644 data/maps/NavelRock_Up1/header.inc create mode 100644 data/maps/NavelRock_Up1/map.json delete mode 100644 data/maps/NavelRock_Up2/events.inc delete mode 100644 data/maps/NavelRock_Up2/header.inc create mode 100644 data/maps/NavelRock_Up2/map.json delete mode 100644 data/maps/NavelRock_Up3/events.inc delete mode 100644 data/maps/NavelRock_Up3/header.inc create mode 100644 data/maps/NavelRock_Up3/map.json delete mode 100644 data/maps/NavelRock_Up4/events.inc delete mode 100644 data/maps/NavelRock_Up4/header.inc create mode 100644 data/maps/NavelRock_Up4/map.json delete mode 100644 data/maps/NewMauville_Entrance/events.inc delete mode 100644 data/maps/NewMauville_Entrance/header.inc create mode 100644 data/maps/NewMauville_Entrance/map.json delete mode 100644 data/maps/NewMauville_Inside/events.inc delete mode 100644 data/maps/NewMauville_Inside/header.inc create mode 100644 data/maps/NewMauville_Inside/map.json delete mode 100644 data/maps/OldaleTown/connections.inc delete mode 100644 data/maps/OldaleTown/events.inc delete mode 100644 data/maps/OldaleTown/header.inc create mode 100644 data/maps/OldaleTown/map.json delete mode 100644 data/maps/OldaleTown_House1/events.inc delete mode 100644 data/maps/OldaleTown_House1/header.inc create mode 100644 data/maps/OldaleTown_House1/map.json delete mode 100644 data/maps/OldaleTown_House2/events.inc delete mode 100644 data/maps/OldaleTown_House2/header.inc create mode 100644 data/maps/OldaleTown_House2/map.json delete mode 100644 data/maps/OldaleTown_Mart/events.inc delete mode 100644 data/maps/OldaleTown_Mart/header.inc create mode 100644 data/maps/OldaleTown_Mart/map.json delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/PacifidlogTown/connections.inc delete mode 100644 data/maps/PacifidlogTown/events.inc delete mode 100644 data/maps/PacifidlogTown/header.inc create mode 100644 data/maps/PacifidlogTown/map.json delete mode 100644 data/maps/PacifidlogTown_House1/events.inc delete mode 100644 data/maps/PacifidlogTown_House1/header.inc create mode 100644 data/maps/PacifidlogTown_House1/map.json delete mode 100644 data/maps/PacifidlogTown_House2/events.inc delete mode 100644 data/maps/PacifidlogTown_House2/header.inc create mode 100644 data/maps/PacifidlogTown_House2/map.json delete mode 100644 data/maps/PacifidlogTown_House3/events.inc delete mode 100644 data/maps/PacifidlogTown_House3/header.inc create mode 100644 data/maps/PacifidlogTown_House3/map.json delete mode 100644 data/maps/PacifidlogTown_House4/events.inc delete mode 100644 data/maps/PacifidlogTown_House4/header.inc create mode 100644 data/maps/PacifidlogTown_House4/map.json delete mode 100644 data/maps/PacifidlogTown_House5/events.inc delete mode 100644 data/maps/PacifidlogTown_House5/header.inc create mode 100644 data/maps/PacifidlogTown_House5/map.json delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/PetalburgCity/connections.inc delete mode 100644 data/maps/PetalburgCity/events.inc delete mode 100644 data/maps/PetalburgCity/header.inc create mode 100644 data/maps/PetalburgCity/map.json delete mode 100644 data/maps/PetalburgCity_Gym/events.inc delete mode 100644 data/maps/PetalburgCity_Gym/header.inc create mode 100644 data/maps/PetalburgCity_Gym/map.json delete mode 100644 data/maps/PetalburgCity_House1/events.inc delete mode 100644 data/maps/PetalburgCity_House1/header.inc create mode 100644 data/maps/PetalburgCity_House1/map.json delete mode 100644 data/maps/PetalburgCity_House2/events.inc delete mode 100644 data/maps/PetalburgCity_House2/header.inc create mode 100644 data/maps/PetalburgCity_House2/map.json delete mode 100644 data/maps/PetalburgCity_Mart/events.inc delete mode 100644 data/maps/PetalburgCity_Mart/header.inc create mode 100644 data/maps/PetalburgCity_Mart/map.json delete mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/PetalburgCity_WallysHouse/events.inc delete mode 100644 data/maps/PetalburgCity_WallysHouse/header.inc create mode 100644 data/maps/PetalburgCity_WallysHouse/map.json delete mode 100644 data/maps/PetalburgWoods/events.inc delete mode 100644 data/maps/PetalburgWoods/header.inc create mode 100644 data/maps/PetalburgWoods/map.json delete mode 100644 data/maps/RecordCorner/events.inc delete mode 100644 data/maps/RecordCorner/header.inc create mode 100644 data/maps/RecordCorner/map.json delete mode 100644 data/maps/Route101/connections.inc delete mode 100644 data/maps/Route101/events.inc delete mode 100644 data/maps/Route101/header.inc create mode 100644 data/maps/Route101/map.json delete mode 100644 data/maps/Route102/connections.inc delete mode 100644 data/maps/Route102/events.inc delete mode 100644 data/maps/Route102/header.inc create mode 100644 data/maps/Route102/map.json delete mode 100644 data/maps/Route103/connections.inc delete mode 100644 data/maps/Route103/events.inc delete mode 100644 data/maps/Route103/header.inc create mode 100644 data/maps/Route103/map.json delete mode 100644 data/maps/Route104/connections.inc delete mode 100644 data/maps/Route104/events.inc delete mode 100644 data/maps/Route104/header.inc create mode 100644 data/maps/Route104/map.json delete mode 100644 data/maps/Route104_MrBrineysHouse/events.inc delete mode 100644 data/maps/Route104_MrBrineysHouse/header.inc create mode 100644 data/maps/Route104_MrBrineysHouse/map.json delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/events.inc delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/header.inc create mode 100644 data/maps/Route104_PrettyPetalFlowerShop/map.json delete mode 100644 data/maps/Route104_Prototype/events.inc delete mode 100644 data/maps/Route104_Prototype/header.inc create mode 100644 data/maps/Route104_Prototype/map.json delete mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc delete mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc create mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json delete mode 100644 data/maps/Route105/connections.inc delete mode 100644 data/maps/Route105/events.inc delete mode 100644 data/maps/Route105/header.inc create mode 100644 data/maps/Route105/map.json delete mode 100644 data/maps/Route106/connections.inc delete mode 100644 data/maps/Route106/events.inc delete mode 100644 data/maps/Route106/header.inc create mode 100644 data/maps/Route106/map.json delete mode 100644 data/maps/Route107/connections.inc delete mode 100644 data/maps/Route107/events.inc delete mode 100644 data/maps/Route107/header.inc create mode 100644 data/maps/Route107/map.json delete mode 100644 data/maps/Route108/connections.inc delete mode 100644 data/maps/Route108/events.inc delete mode 100644 data/maps/Route108/header.inc create mode 100644 data/maps/Route108/map.json delete mode 100644 data/maps/Route109/connections.inc delete mode 100644 data/maps/Route109/events.inc delete mode 100644 data/maps/Route109/header.inc create mode 100644 data/maps/Route109/map.json delete mode 100644 data/maps/Route109_SeashoreHouse/events.inc delete mode 100644 data/maps/Route109_SeashoreHouse/header.inc create mode 100644 data/maps/Route109_SeashoreHouse/map.json delete mode 100644 data/maps/Route110/connections.inc delete mode 100644 data/maps/Route110/events.inc delete mode 100644 data/maps/Route110/header.inc create mode 100644 data/maps/Route110/map.json delete mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json delete mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json delete mode 100644 data/maps/Route110_TrickHouseCorridor/events.inc delete mode 100644 data/maps/Route110_TrickHouseCorridor/header.inc create mode 100644 data/maps/Route110_TrickHouseCorridor/map.json delete mode 100644 data/maps/Route110_TrickHouseEnd/events.inc delete mode 100644 data/maps/Route110_TrickHouseEnd/header.inc create mode 100644 data/maps/Route110_TrickHouseEnd/map.json delete mode 100644 data/maps/Route110_TrickHouseEntrance/events.inc delete mode 100644 data/maps/Route110_TrickHouseEntrance/header.inc create mode 100644 data/maps/Route110_TrickHouseEntrance/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle1/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle1/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle1/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle2/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle2/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle2/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle3/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle3/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle3/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle4/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle4/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle4/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle5/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle5/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle5/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle6/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle6/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle6/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle7/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle7/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle7/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle8/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle8/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle8/map.json delete mode 100644 data/maps/Route111/connections.inc delete mode 100644 data/maps/Route111/events.inc delete mode 100644 data/maps/Route111/header.inc create mode 100644 data/maps/Route111/map.json delete mode 100644 data/maps/Route111_OldLadysRestStop/events.inc delete mode 100644 data/maps/Route111_OldLadysRestStop/header.inc create mode 100644 data/maps/Route111_OldLadysRestStop/map.json delete mode 100644 data/maps/Route111_WinstrateFamilysHouse/events.inc delete mode 100644 data/maps/Route111_WinstrateFamilysHouse/header.inc create mode 100644 data/maps/Route111_WinstrateFamilysHouse/map.json delete mode 100644 data/maps/Route112/connections.inc delete mode 100644 data/maps/Route112/events.inc delete mode 100644 data/maps/Route112/header.inc create mode 100644 data/maps/Route112/map.json delete mode 100644 data/maps/Route112_CableCarStation/events.inc delete mode 100644 data/maps/Route112_CableCarStation/header.inc create mode 100644 data/maps/Route112_CableCarStation/map.json delete mode 100644 data/maps/Route113/connections.inc delete mode 100644 data/maps/Route113/events.inc delete mode 100644 data/maps/Route113/header.inc create mode 100644 data/maps/Route113/map.json delete mode 100644 data/maps/Route113_GlassWorkshop/events.inc delete mode 100644 data/maps/Route113_GlassWorkshop/header.inc create mode 100644 data/maps/Route113_GlassWorkshop/map.json delete mode 100644 data/maps/Route114/connections.inc delete mode 100644 data/maps/Route114/events.inc delete mode 100644 data/maps/Route114/header.inc create mode 100644 data/maps/Route114/map.json delete mode 100644 data/maps/Route114_FossilManiacsHouse/events.inc delete mode 100644 data/maps/Route114_FossilManiacsHouse/header.inc create mode 100644 data/maps/Route114_FossilManiacsHouse/map.json delete mode 100644 data/maps/Route114_FossilManiacsTunnel/events.inc delete mode 100644 data/maps/Route114_FossilManiacsTunnel/header.inc create mode 100644 data/maps/Route114_FossilManiacsTunnel/map.json delete mode 100644 data/maps/Route114_LanettesHouse/events.inc delete mode 100644 data/maps/Route114_LanettesHouse/header.inc create mode 100644 data/maps/Route114_LanettesHouse/map.json delete mode 100644 data/maps/Route115/connections.inc delete mode 100644 data/maps/Route115/events.inc delete mode 100644 data/maps/Route115/header.inc create mode 100644 data/maps/Route115/map.json delete mode 100644 data/maps/Route116/connections.inc delete mode 100644 data/maps/Route116/events.inc delete mode 100644 data/maps/Route116/header.inc create mode 100644 data/maps/Route116/map.json delete mode 100644 data/maps/Route116_TunnelersRestHouse/events.inc delete mode 100644 data/maps/Route116_TunnelersRestHouse/header.inc create mode 100644 data/maps/Route116_TunnelersRestHouse/map.json delete mode 100644 data/maps/Route117/connections.inc delete mode 100644 data/maps/Route117/events.inc delete mode 100644 data/maps/Route117/header.inc create mode 100644 data/maps/Route117/map.json delete mode 100644 data/maps/Route117_PokemonDayCare/events.inc delete mode 100644 data/maps/Route117_PokemonDayCare/header.inc create mode 100644 data/maps/Route117_PokemonDayCare/map.json delete mode 100644 data/maps/Route118/connections.inc delete mode 100644 data/maps/Route118/events.inc delete mode 100644 data/maps/Route118/header.inc create mode 100644 data/maps/Route118/map.json delete mode 100644 data/maps/Route119/connections.inc delete mode 100644 data/maps/Route119/events.inc delete mode 100644 data/maps/Route119/header.inc create mode 100644 data/maps/Route119/map.json delete mode 100644 data/maps/Route119_House/events.inc delete mode 100644 data/maps/Route119_House/header.inc create mode 100644 data/maps/Route119_House/map.json delete mode 100644 data/maps/Route119_WeatherInstitute_1F/events.inc delete mode 100644 data/maps/Route119_WeatherInstitute_1F/header.inc create mode 100644 data/maps/Route119_WeatherInstitute_1F/map.json delete mode 100644 data/maps/Route119_WeatherInstitute_2F/events.inc delete mode 100644 data/maps/Route119_WeatherInstitute_2F/header.inc create mode 100644 data/maps/Route119_WeatherInstitute_2F/map.json delete mode 100644 data/maps/Route120/connections.inc delete mode 100644 data/maps/Route120/events.inc delete mode 100644 data/maps/Route120/header.inc create mode 100644 data/maps/Route120/map.json delete mode 100644 data/maps/Route121/connections.inc delete mode 100644 data/maps/Route121/events.inc delete mode 100644 data/maps/Route121/header.inc create mode 100644 data/maps/Route121/map.json delete mode 100644 data/maps/Route121_SafariZoneEntrance/events.inc delete mode 100644 data/maps/Route121_SafariZoneEntrance/header.inc create mode 100644 data/maps/Route121_SafariZoneEntrance/map.json delete mode 100644 data/maps/Route122/connections.inc delete mode 100644 data/maps/Route122/events.inc delete mode 100644 data/maps/Route122/header.inc create mode 100644 data/maps/Route122/map.json delete mode 100644 data/maps/Route123/connections.inc delete mode 100644 data/maps/Route123/events.inc delete mode 100644 data/maps/Route123/header.inc create mode 100644 data/maps/Route123/map.json delete mode 100644 data/maps/Route123_BerryMastersHouse/events.inc delete mode 100644 data/maps/Route123_BerryMastersHouse/header.inc create mode 100644 data/maps/Route123_BerryMastersHouse/map.json delete mode 100644 data/maps/Route124/connections.inc delete mode 100644 data/maps/Route124/events.inc delete mode 100644 data/maps/Route124/header.inc create mode 100644 data/maps/Route124/map.json delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/events.inc delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/header.inc create mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/map.json delete mode 100644 data/maps/Route125/connections.inc delete mode 100644 data/maps/Route125/events.inc delete mode 100644 data/maps/Route125/header.inc create mode 100644 data/maps/Route125/map.json delete mode 100644 data/maps/Route126/connections.inc delete mode 100644 data/maps/Route126/events.inc delete mode 100644 data/maps/Route126/header.inc create mode 100644 data/maps/Route126/map.json delete mode 100644 data/maps/Route127/connections.inc delete mode 100644 data/maps/Route127/events.inc delete mode 100644 data/maps/Route127/header.inc create mode 100644 data/maps/Route127/map.json delete mode 100644 data/maps/Route128/connections.inc delete mode 100644 data/maps/Route128/events.inc delete mode 100644 data/maps/Route128/header.inc create mode 100644 data/maps/Route128/map.json delete mode 100644 data/maps/Route129/connections.inc delete mode 100644 data/maps/Route129/events.inc delete mode 100644 data/maps/Route129/header.inc create mode 100644 data/maps/Route129/map.json delete mode 100644 data/maps/Route130/connections.inc delete mode 100644 data/maps/Route130/events.inc delete mode 100644 data/maps/Route130/header.inc create mode 100644 data/maps/Route130/map.json delete mode 100644 data/maps/Route131/connections.inc delete mode 100644 data/maps/Route131/events.inc delete mode 100644 data/maps/Route131/header.inc create mode 100644 data/maps/Route131/map.json delete mode 100644 data/maps/Route132/connections.inc delete mode 100644 data/maps/Route132/events.inc delete mode 100644 data/maps/Route132/header.inc create mode 100644 data/maps/Route132/map.json delete mode 100644 data/maps/Route133/connections.inc delete mode 100644 data/maps/Route133/events.inc delete mode 100644 data/maps/Route133/header.inc create mode 100644 data/maps/Route133/map.json delete mode 100644 data/maps/Route134/connections.inc delete mode 100644 data/maps/Route134/events.inc delete mode 100644 data/maps/Route134/header.inc create mode 100644 data/maps/Route134/map.json delete mode 100644 data/maps/RustboroCity/connections.inc delete mode 100644 data/maps/RustboroCity/events.inc delete mode 100644 data/maps/RustboroCity/header.inc create mode 100644 data/maps/RustboroCity/map.json delete mode 100644 data/maps/RustboroCity_CuttersHouse/events.inc delete mode 100644 data/maps/RustboroCity_CuttersHouse/header.inc create mode 100644 data/maps/RustboroCity_CuttersHouse/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_1F/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_2F/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_3F/map.json delete mode 100644 data/maps/RustboroCity_Flat1_1F/events.inc delete mode 100644 data/maps/RustboroCity_Flat1_1F/header.inc create mode 100644 data/maps/RustboroCity_Flat1_1F/map.json delete mode 100644 data/maps/RustboroCity_Flat1_2F/events.inc delete mode 100644 data/maps/RustboroCity_Flat1_2F/header.inc create mode 100644 data/maps/RustboroCity_Flat1_2F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_1F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_1F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_1F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_2F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_2F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_2F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_3F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_3F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_3F/map.json delete mode 100644 data/maps/RustboroCity_Gym/events.inc delete mode 100644 data/maps/RustboroCity_Gym/header.inc create mode 100644 data/maps/RustboroCity_Gym/map.json delete mode 100644 data/maps/RustboroCity_House1/events.inc delete mode 100644 data/maps/RustboroCity_House1/header.inc create mode 100644 data/maps/RustboroCity_House1/map.json delete mode 100644 data/maps/RustboroCity_House2/events.inc delete mode 100644 data/maps/RustboroCity_House2/header.inc create mode 100644 data/maps/RustboroCity_House2/map.json delete mode 100644 data/maps/RustboroCity_House3/events.inc delete mode 100644 data/maps/RustboroCity_House3/header.inc create mode 100644 data/maps/RustboroCity_House3/map.json delete mode 100644 data/maps/RustboroCity_Mart/events.inc delete mode 100644 data/maps/RustboroCity_Mart/header.inc create mode 100644 data/maps/RustboroCity_Mart/map.json delete mode 100644 data/maps/RustboroCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/RustboroCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/RustboroCity_PokemonSchool/events.inc delete mode 100644 data/maps/RustboroCity_PokemonSchool/header.inc create mode 100644 data/maps/RustboroCity_PokemonSchool/map.json delete mode 100644 data/maps/RusturfTunnel/events.inc delete mode 100644 data/maps/RusturfTunnel/header.inc create mode 100644 data/maps/RusturfTunnel/map.json delete mode 100644 data/maps/SSTidalCorridor/events.inc delete mode 100644 data/maps/SSTidalCorridor/header.inc create mode 100644 data/maps/SSTidalCorridor/map.json delete mode 100644 data/maps/SSTidalLowerDeck/events.inc delete mode 100644 data/maps/SSTidalLowerDeck/header.inc create mode 100644 data/maps/SSTidalLowerDeck/map.json delete mode 100644 data/maps/SSTidalRooms/events.inc delete mode 100644 data/maps/SSTidalRooms/header.inc create mode 100644 data/maps/SSTidalRooms/map.json delete mode 100644 data/maps/SafariZone_North/connections.inc delete mode 100644 data/maps/SafariZone_North/events.inc delete mode 100644 data/maps/SafariZone_North/header.inc create mode 100644 data/maps/SafariZone_North/map.json delete mode 100644 data/maps/SafariZone_Northeast/connections.inc delete mode 100644 data/maps/SafariZone_Northeast/events.inc delete mode 100644 data/maps/SafariZone_Northeast/header.inc create mode 100644 data/maps/SafariZone_Northeast/map.json delete mode 100644 data/maps/SafariZone_Northwest/connections.inc delete mode 100644 data/maps/SafariZone_Northwest/events.inc delete mode 100644 data/maps/SafariZone_Northwest/header.inc create mode 100644 data/maps/SafariZone_Northwest/map.json delete mode 100644 data/maps/SafariZone_RestHouse/events.inc delete mode 100644 data/maps/SafariZone_RestHouse/header.inc create mode 100644 data/maps/SafariZone_RestHouse/map.json delete mode 100644 data/maps/SafariZone_South/connections.inc delete mode 100644 data/maps/SafariZone_South/events.inc delete mode 100644 data/maps/SafariZone_South/header.inc create mode 100644 data/maps/SafariZone_South/map.json delete mode 100644 data/maps/SafariZone_Southeast/connections.inc delete mode 100644 data/maps/SafariZone_Southeast/events.inc delete mode 100644 data/maps/SafariZone_Southeast/header.inc create mode 100644 data/maps/SafariZone_Southeast/map.json delete mode 100644 data/maps/SafariZone_Southwest/connections.inc delete mode 100644 data/maps/SafariZone_Southwest/events.inc delete mode 100644 data/maps/SafariZone_Southwest/header.inc create mode 100644 data/maps/SafariZone_Southwest/map.json delete mode 100644 data/maps/ScorchedSlab/events.inc delete mode 100644 data/maps/ScorchedSlab/header.inc create mode 100644 data/maps/ScorchedSlab/map.json delete mode 100644 data/maps/SeafloorCavern_Entrance/events.inc delete mode 100644 data/maps/SeafloorCavern_Entrance/header.inc create mode 100644 data/maps/SeafloorCavern_Entrance/map.json delete mode 100644 data/maps/SeafloorCavern_Room1/events.inc delete mode 100644 data/maps/SeafloorCavern_Room1/header.inc create mode 100644 data/maps/SeafloorCavern_Room1/map.json delete mode 100644 data/maps/SeafloorCavern_Room2/events.inc delete mode 100644 data/maps/SeafloorCavern_Room2/header.inc create mode 100644 data/maps/SeafloorCavern_Room2/map.json delete mode 100644 data/maps/SeafloorCavern_Room3/events.inc delete mode 100644 data/maps/SeafloorCavern_Room3/header.inc create mode 100644 data/maps/SeafloorCavern_Room3/map.json delete mode 100644 data/maps/SeafloorCavern_Room4/events.inc delete mode 100644 data/maps/SeafloorCavern_Room4/header.inc create mode 100644 data/maps/SeafloorCavern_Room4/map.json delete mode 100644 data/maps/SeafloorCavern_Room5/events.inc delete mode 100644 data/maps/SeafloorCavern_Room5/header.inc create mode 100644 data/maps/SeafloorCavern_Room5/map.json delete mode 100644 data/maps/SeafloorCavern_Room6/events.inc delete mode 100644 data/maps/SeafloorCavern_Room6/header.inc create mode 100644 data/maps/SeafloorCavern_Room6/map.json delete mode 100644 data/maps/SeafloorCavern_Room7/events.inc delete mode 100644 data/maps/SeafloorCavern_Room7/header.inc create mode 100644 data/maps/SeafloorCavern_Room7/map.json delete mode 100644 data/maps/SeafloorCavern_Room8/events.inc delete mode 100644 data/maps/SeafloorCavern_Room8/header.inc create mode 100644 data/maps/SeafloorCavern_Room8/map.json delete mode 100644 data/maps/SeafloorCavern_Room9/events.inc delete mode 100644 data/maps/SeafloorCavern_Room9/header.inc create mode 100644 data/maps/SeafloorCavern_Room9/map.json delete mode 100644 data/maps/SealedChamber_InnerRoom/events.inc delete mode 100644 data/maps/SealedChamber_InnerRoom/header.inc create mode 100644 data/maps/SealedChamber_InnerRoom/map.json delete mode 100644 data/maps/SealedChamber_OuterRoom/events.inc delete mode 100644 data/maps/SealedChamber_OuterRoom/header.inc create mode 100644 data/maps/SealedChamber_OuterRoom/map.json delete mode 100644 data/maps/SecretBase_BlueCave1/events.inc delete mode 100644 data/maps/SecretBase_BlueCave1/header.inc create mode 100644 data/maps/SecretBase_BlueCave1/map.json delete mode 100644 data/maps/SecretBase_BlueCave2/events.inc delete mode 100644 data/maps/SecretBase_BlueCave2/header.inc create mode 100644 data/maps/SecretBase_BlueCave2/map.json delete mode 100644 data/maps/SecretBase_BlueCave3/events.inc delete mode 100644 data/maps/SecretBase_BlueCave3/header.inc create mode 100644 data/maps/SecretBase_BlueCave3/map.json delete mode 100644 data/maps/SecretBase_BlueCave4/events.inc delete mode 100644 data/maps/SecretBase_BlueCave4/header.inc create mode 100644 data/maps/SecretBase_BlueCave4/map.json delete mode 100644 data/maps/SecretBase_BrownCave1/events.inc delete mode 100644 data/maps/SecretBase_BrownCave1/header.inc create mode 100644 data/maps/SecretBase_BrownCave1/map.json delete mode 100644 data/maps/SecretBase_BrownCave2/events.inc delete mode 100644 data/maps/SecretBase_BrownCave2/header.inc create mode 100644 data/maps/SecretBase_BrownCave2/map.json delete mode 100644 data/maps/SecretBase_BrownCave3/events.inc delete mode 100644 data/maps/SecretBase_BrownCave3/header.inc create mode 100644 data/maps/SecretBase_BrownCave3/map.json delete mode 100644 data/maps/SecretBase_BrownCave4/events.inc delete mode 100644 data/maps/SecretBase_BrownCave4/header.inc create mode 100644 data/maps/SecretBase_BrownCave4/map.json delete mode 100644 data/maps/SecretBase_RedCave1/events.inc delete mode 100644 data/maps/SecretBase_RedCave1/header.inc create mode 100644 data/maps/SecretBase_RedCave1/map.json delete mode 100644 data/maps/SecretBase_RedCave2/events.inc delete mode 100644 data/maps/SecretBase_RedCave2/header.inc create mode 100644 data/maps/SecretBase_RedCave2/map.json delete mode 100644 data/maps/SecretBase_RedCave3/events.inc delete mode 100644 data/maps/SecretBase_RedCave3/header.inc create mode 100644 data/maps/SecretBase_RedCave3/map.json delete mode 100644 data/maps/SecretBase_RedCave4/events.inc delete mode 100644 data/maps/SecretBase_RedCave4/header.inc create mode 100644 data/maps/SecretBase_RedCave4/map.json delete mode 100644 data/maps/SecretBase_Shrub1/events.inc delete mode 100644 data/maps/SecretBase_Shrub1/header.inc create mode 100644 data/maps/SecretBase_Shrub1/map.json delete mode 100644 data/maps/SecretBase_Shrub2/events.inc delete mode 100644 data/maps/SecretBase_Shrub2/header.inc create mode 100644 data/maps/SecretBase_Shrub2/map.json delete mode 100644 data/maps/SecretBase_Shrub3/events.inc delete mode 100644 data/maps/SecretBase_Shrub3/header.inc create mode 100644 data/maps/SecretBase_Shrub3/map.json delete mode 100644 data/maps/SecretBase_Shrub4/events.inc delete mode 100644 data/maps/SecretBase_Shrub4/header.inc create mode 100644 data/maps/SecretBase_Shrub4/map.json delete mode 100644 data/maps/SecretBase_Tree1/events.inc delete mode 100644 data/maps/SecretBase_Tree1/header.inc create mode 100644 data/maps/SecretBase_Tree1/map.json delete mode 100644 data/maps/SecretBase_Tree2/events.inc delete mode 100644 data/maps/SecretBase_Tree2/header.inc create mode 100644 data/maps/SecretBase_Tree2/map.json delete mode 100644 data/maps/SecretBase_Tree3/events.inc delete mode 100644 data/maps/SecretBase_Tree3/header.inc create mode 100644 data/maps/SecretBase_Tree3/map.json delete mode 100644 data/maps/SecretBase_Tree4/events.inc delete mode 100644 data/maps/SecretBase_Tree4/header.inc create mode 100644 data/maps/SecretBase_Tree4/map.json delete mode 100644 data/maps/SecretBase_YellowCave1/events.inc delete mode 100644 data/maps/SecretBase_YellowCave1/header.inc create mode 100644 data/maps/SecretBase_YellowCave1/map.json delete mode 100644 data/maps/SecretBase_YellowCave2/events.inc delete mode 100644 data/maps/SecretBase_YellowCave2/header.inc create mode 100644 data/maps/SecretBase_YellowCave2/map.json delete mode 100644 data/maps/SecretBase_YellowCave3/events.inc delete mode 100644 data/maps/SecretBase_YellowCave3/header.inc create mode 100644 data/maps/SecretBase_YellowCave3/map.json delete mode 100644 data/maps/SecretBase_YellowCave4/events.inc delete mode 100644 data/maps/SecretBase_YellowCave4/header.inc create mode 100644 data/maps/SecretBase_YellowCave4/map.json delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/events.inc delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/header.inc create mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/map.json delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/events.inc delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/header.inc create mode 100644 data/maps/ShoalCave_HighTideInnerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideIceRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideInnerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideLowerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideStairsRoom/map.json delete mode 100644 data/maps/SingleBattleColosseum/events.inc delete mode 100644 data/maps/SingleBattleColosseum/header.inc create mode 100644 data/maps/SingleBattleColosseum/map.json delete mode 100644 data/maps/SkyPillar_1F/events.inc delete mode 100644 data/maps/SkyPillar_1F/header.inc create mode 100644 data/maps/SkyPillar_1F/map.json delete mode 100644 data/maps/SkyPillar_2F/events.inc delete mode 100644 data/maps/SkyPillar_2F/header.inc create mode 100644 data/maps/SkyPillar_2F/map.json delete mode 100644 data/maps/SkyPillar_3F/events.inc delete mode 100644 data/maps/SkyPillar_3F/header.inc create mode 100644 data/maps/SkyPillar_3F/map.json delete mode 100644 data/maps/SkyPillar_4F/events.inc delete mode 100644 data/maps/SkyPillar_4F/header.inc create mode 100644 data/maps/SkyPillar_4F/map.json delete mode 100644 data/maps/SkyPillar_5F/events.inc delete mode 100644 data/maps/SkyPillar_5F/header.inc create mode 100644 data/maps/SkyPillar_5F/map.json delete mode 100644 data/maps/SkyPillar_Entrance/events.inc delete mode 100644 data/maps/SkyPillar_Entrance/header.inc create mode 100644 data/maps/SkyPillar_Entrance/map.json delete mode 100644 data/maps/SkyPillar_Outside/events.inc delete mode 100644 data/maps/SkyPillar_Outside/header.inc create mode 100644 data/maps/SkyPillar_Outside/map.json delete mode 100644 data/maps/SkyPillar_Top/events.inc delete mode 100644 data/maps/SkyPillar_Top/header.inc create mode 100644 data/maps/SkyPillar_Top/map.json delete mode 100644 data/maps/SlateportCity/connections.inc delete mode 100644 data/maps/SlateportCity/events.inc delete mode 100644 data/maps/SlateportCity/header.inc create mode 100644 data/maps/SlateportCity/map.json delete mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/header.inc create mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/map.json delete mode 100644 data/maps/SlateportCity_BattleTentCorridor/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentCorridor/header.inc create mode 100644 data/maps/SlateportCity_BattleTentCorridor/map.json delete mode 100644 data/maps/SlateportCity_BattleTentLobby/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentLobby/header.inc create mode 100644 data/maps/SlateportCity_BattleTentLobby/map.json delete mode 100644 data/maps/SlateportCity_Harbor/events.inc delete mode 100644 data/maps/SlateportCity_Harbor/header.inc create mode 100644 data/maps/SlateportCity_Harbor/map.json delete mode 100644 data/maps/SlateportCity_House1/events.inc delete mode 100644 data/maps/SlateportCity_House1/header.inc create mode 100644 data/maps/SlateportCity_House1/map.json delete mode 100644 data/maps/SlateportCity_House2/events.inc delete mode 100644 data/maps/SlateportCity_House2/header.inc create mode 100644 data/maps/SlateportCity_House2/map.json delete mode 100644 data/maps/SlateportCity_Mart/events.inc delete mode 100644 data/maps/SlateportCity_Mart/header.inc create mode 100644 data/maps/SlateportCity_Mart/map.json delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/events.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/header.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/map.json delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/events.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/header.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/map.json delete mode 100644 data/maps/SlateportCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/SlateportCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/SlateportCity_PokemonFanClub/events.inc delete mode 100644 data/maps/SlateportCity_PokemonFanClub/header.inc create mode 100644 data/maps/SlateportCity_PokemonFanClub/map.json delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/events.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/header.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_1F/map.json delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/events.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/header.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_2F/map.json delete mode 100644 data/maps/SootopolisCity/connections.inc delete mode 100644 data/maps/SootopolisCity/events.inc delete mode 100644 data/maps/SootopolisCity/header.inc create mode 100644 data/maps/SootopolisCity/map.json delete mode 100644 data/maps/SootopolisCity_Gym_1F/events.inc delete mode 100644 data/maps/SootopolisCity_Gym_1F/header.inc create mode 100644 data/maps/SootopolisCity_Gym_1F/map.json delete mode 100644 data/maps/SootopolisCity_Gym_B1F/events.inc delete mode 100644 data/maps/SootopolisCity_Gym_B1F/header.inc create mode 100644 data/maps/SootopolisCity_Gym_B1F/map.json delete mode 100644 data/maps/SootopolisCity_House1/events.inc delete mode 100644 data/maps/SootopolisCity_House1/header.inc create mode 100644 data/maps/SootopolisCity_House1/map.json delete mode 100644 data/maps/SootopolisCity_House2/events.inc delete mode 100644 data/maps/SootopolisCity_House2/header.inc create mode 100644 data/maps/SootopolisCity_House2/map.json delete mode 100644 data/maps/SootopolisCity_House3/events.inc delete mode 100644 data/maps/SootopolisCity_House3/header.inc create mode 100644 data/maps/SootopolisCity_House3/map.json delete mode 100644 data/maps/SootopolisCity_House4/events.inc delete mode 100644 data/maps/SootopolisCity_House4/header.inc create mode 100644 data/maps/SootopolisCity_House4/map.json delete mode 100644 data/maps/SootopolisCity_House5/events.inc delete mode 100644 data/maps/SootopolisCity_House5/header.inc create mode 100644 data/maps/SootopolisCity_House5/map.json delete mode 100644 data/maps/SootopolisCity_House6/events.inc delete mode 100644 data/maps/SootopolisCity_House6/header.inc create mode 100644 data/maps/SootopolisCity_House6/map.json delete mode 100644 data/maps/SootopolisCity_House7/events.inc delete mode 100644 data/maps/SootopolisCity_House7/header.inc create mode 100644 data/maps/SootopolisCity_House7/map.json delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc create mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/map.json delete mode 100644 data/maps/SootopolisCity_Mart/events.inc delete mode 100644 data/maps/SootopolisCity_Mart/header.inc create mode 100644 data/maps/SootopolisCity_Mart/map.json delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json delete mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/SouthernIsland_Exterior/events.inc delete mode 100644 data/maps/SouthernIsland_Exterior/header.inc create mode 100644 data/maps/SouthernIsland_Exterior/map.json delete mode 100644 data/maps/SouthernIsland_Interior/events.inc delete mode 100644 data/maps/SouthernIsland_Interior/header.inc create mode 100644 data/maps/SouthernIsland_Interior/map.json delete mode 100644 data/maps/TerraCave_End/events.inc delete mode 100644 data/maps/TerraCave_End/header.inc create mode 100644 data/maps/TerraCave_End/map.json delete mode 100644 data/maps/TerraCave_Entrance/events.inc delete mode 100644 data/maps/TerraCave_Entrance/header.inc create mode 100644 data/maps/TerraCave_Entrance/map.json delete mode 100644 data/maps/TradeCenter/events.inc delete mode 100644 data/maps/TradeCenter/header.inc create mode 100644 data/maps/TradeCenter/map.json delete mode 100644 data/maps/TrainerHill_1F/events.inc delete mode 100644 data/maps/TrainerHill_1F/header.inc create mode 100644 data/maps/TrainerHill_1F/map.json delete mode 100644 data/maps/TrainerHill_2F/events.inc delete mode 100644 data/maps/TrainerHill_2F/header.inc create mode 100644 data/maps/TrainerHill_2F/map.json delete mode 100644 data/maps/TrainerHill_3F/events.inc delete mode 100644 data/maps/TrainerHill_3F/header.inc create mode 100644 data/maps/TrainerHill_3F/map.json delete mode 100644 data/maps/TrainerHill_4F/events.inc delete mode 100644 data/maps/TrainerHill_4F/header.inc create mode 100644 data/maps/TrainerHill_4F/map.json delete mode 100644 data/maps/TrainerHill_Elevator/events.inc delete mode 100644 data/maps/TrainerHill_Elevator/header.inc create mode 100644 data/maps/TrainerHill_Elevator/map.json delete mode 100644 data/maps/TrainerHill_Entrance/events.inc delete mode 100644 data/maps/TrainerHill_Entrance/header.inc create mode 100644 data/maps/TrainerHill_Entrance/map.json delete mode 100644 data/maps/TrainerHill_Roof/events.inc delete mode 100644 data/maps/TrainerHill_Roof/header.inc create mode 100644 data/maps/TrainerHill_Roof/map.json delete mode 100644 data/maps/Underwater1/connections.inc delete mode 100644 data/maps/Underwater1/events.inc delete mode 100644 data/maps/Underwater1/header.inc create mode 100644 data/maps/Underwater1/map.json delete mode 100644 data/maps/Underwater2/connections.inc delete mode 100644 data/maps/Underwater2/events.inc delete mode 100644 data/maps/Underwater2/header.inc create mode 100644 data/maps/Underwater2/map.json delete mode 100644 data/maps/Underwater3/connections.inc delete mode 100644 data/maps/Underwater3/events.inc delete mode 100644 data/maps/Underwater3/header.inc create mode 100644 data/maps/Underwater3/map.json delete mode 100644 data/maps/Underwater4/connections.inc delete mode 100644 data/maps/Underwater4/events.inc delete mode 100644 data/maps/Underwater4/header.inc create mode 100644 data/maps/Underwater4/map.json delete mode 100644 data/maps/Underwater5/connections.inc delete mode 100644 data/maps/Underwater5/events.inc delete mode 100644 data/maps/Underwater5/header.inc create mode 100644 data/maps/Underwater5/map.json delete mode 100644 data/maps/Underwater6/connections.inc delete mode 100644 data/maps/Underwater6/events.inc delete mode 100644 data/maps/Underwater6/header.inc create mode 100644 data/maps/Underwater6/map.json delete mode 100644 data/maps/Underwater7/connections.inc delete mode 100644 data/maps/Underwater7/events.inc delete mode 100644 data/maps/Underwater7/header.inc create mode 100644 data/maps/Underwater7/map.json delete mode 100644 data/maps/Underwater_MarineCave/events.inc delete mode 100644 data/maps/Underwater_MarineCave/header.inc create mode 100644 data/maps/Underwater_MarineCave/map.json delete mode 100644 data/maps/Underwater_Route134/events.inc delete mode 100644 data/maps/Underwater_Route134/header.inc create mode 100644 data/maps/Underwater_Route134/map.json delete mode 100644 data/maps/Underwater_SeafloorCavern/events.inc delete mode 100644 data/maps/Underwater_SeafloorCavern/header.inc create mode 100644 data/maps/Underwater_SeafloorCavern/map.json delete mode 100644 data/maps/Underwater_SealedChamber/events.inc delete mode 100644 data/maps/Underwater_SealedChamber/header.inc create mode 100644 data/maps/Underwater_SealedChamber/map.json delete mode 100644 data/maps/Underwater_SootopolisCity/events.inc delete mode 100644 data/maps/Underwater_SootopolisCity/header.inc create mode 100644 data/maps/Underwater_SootopolisCity/map.json delete mode 100644 data/maps/UnionRoom/events.inc delete mode 100644 data/maps/UnionRoom/header.inc create mode 100644 data/maps/UnionRoom/map.json delete mode 100644 data/maps/UnknownMap_25_29/events.inc delete mode 100644 data/maps/UnknownMap_25_29/header.inc create mode 100644 data/maps/UnknownMap_25_29/map.json delete mode 100644 data/maps/UnknownMap_25_30/events.inc delete mode 100644 data/maps/UnknownMap_25_30/header.inc create mode 100644 data/maps/UnknownMap_25_30/map.json delete mode 100644 data/maps/UnknownMap_25_31/events.inc delete mode 100644 data/maps/UnknownMap_25_31/header.inc create mode 100644 data/maps/UnknownMap_25_31/map.json delete mode 100644 data/maps/UnknownMap_25_32/events.inc delete mode 100644 data/maps/UnknownMap_25_32/header.inc create mode 100644 data/maps/UnknownMap_25_32/map.json delete mode 100644 data/maps/UnknownMap_25_33/events.inc delete mode 100644 data/maps/UnknownMap_25_33/header.inc create mode 100644 data/maps/UnknownMap_25_33/map.json delete mode 100644 data/maps/UnknownMap_25_34/events.inc delete mode 100644 data/maps/UnknownMap_25_34/header.inc create mode 100644 data/maps/UnknownMap_25_34/map.json delete mode 100644 data/maps/VerdanturfTown/connections.inc delete mode 100644 data/maps/VerdanturfTown/events.inc delete mode 100644 data/maps/VerdanturfTown/header.inc create mode 100644 data/maps/VerdanturfTown/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentLobby/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentLobby/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentLobby/map.json delete mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc delete mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc create mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/map.json delete mode 100644 data/maps/VerdanturfTown_House/events.inc delete mode 100644 data/maps/VerdanturfTown_House/header.inc create mode 100644 data/maps/VerdanturfTown_House/map.json delete mode 100644 data/maps/VerdanturfTown_Mart/events.inc delete mode 100644 data/maps/VerdanturfTown_Mart/header.inc create mode 100644 data/maps/VerdanturfTown_Mart/map.json delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/VerdanturfTown_WandasHouse/events.inc delete mode 100644 data/maps/VerdanturfTown_WandasHouse/header.inc create mode 100644 data/maps/VerdanturfTown_WandasHouse/map.json delete mode 100644 data/maps/VictoryRoad_1F/events.inc delete mode 100644 data/maps/VictoryRoad_1F/header.inc create mode 100644 data/maps/VictoryRoad_1F/map.json delete mode 100644 data/maps/VictoryRoad_B1F/events.inc delete mode 100644 data/maps/VictoryRoad_B1F/header.inc create mode 100644 data/maps/VictoryRoad_B1F/map.json delete mode 100644 data/maps/VictoryRoad_B2F/events.inc delete mode 100644 data/maps/VictoryRoad_B2F/header.inc create mode 100644 data/maps/VictoryRoad_B2F/map.json delete mode 100644 data/maps/connections.inc delete mode 100644 data/maps/groups.inc delete mode 100644 data/maps/headers.inc create mode 100644 data/maps/map_groups.json create mode 100755 include/constants/map_groups.h create mode 100755 map_data_rules.mk create mode 100755 tools/mapjson/mapjson.py diff --git a/Makefile b/Makefile index 32cc9df73e..cb9ce27bb9 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE) PREPROC := tools/preproc/preproc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) FIX := tools/gbafix/gbafix$(EXE) +MAPJSON := python tools/mapjson/mapjson.py # Clear the default suffixes .SUFFIXES: @@ -97,12 +98,16 @@ clean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc + rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc + find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* include graphics_file_rules.mk +include map_data_rules.mk include spritesheet_rules.mk include songs.mk @@ -121,6 +126,7 @@ include songs.mk sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress sound/%.bin: sound/%.aif ; $(AIF) $< $@ + $(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/libc.o: CFLAGS := -O2 diff --git a/data/event_scripts.s b/data/event_scripts.s index 3c3c38eb9b..fbee3987c7 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7,6 +7,7 @@ #include "constants/flags.h" #include "constants/items.h" #include "constants/heal_locations.h" +#include "constants/layouts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" diff --git a/data/layouts.inc b/data/layouts.inc deleted file mode 100755 index 97b3b97c8e..0000000000 --- a/data/layouts.inc +++ /dev/null @@ -1,441 +0,0 @@ - .include "data/layouts/PetalburgCity/layout.inc" - .include "data/layouts/SlateportCity/layout.inc" - .include "data/layouts/MauvilleCity/layout.inc" - .include "data/layouts/RustboroCity/layout.inc" - .include "data/layouts/FortreeCity/layout.inc" - .include "data/layouts/LilycoveCity/layout.inc" - .include "data/layouts/MossdeepCity/layout.inc" - .include "data/layouts/SootopolisCity/layout.inc" - .include "data/layouts/EverGrandeCity/layout.inc" - .include "data/layouts/LittlerootTown/layout.inc" - .include "data/layouts/OldaleTown/layout.inc" - .include "data/layouts/DewfordTown/layout.inc" - .include "data/layouts/LavaridgeTown/layout.inc" - .include "data/layouts/FallarborTown/layout.inc" - .include "data/layouts/VerdanturfTown/layout.inc" - .include "data/layouts/PacifidlogTown/layout.inc" - .include "data/layouts/Route101/layout.inc" - .include "data/layouts/Route102/layout.inc" - .include "data/layouts/Route103/layout.inc" - .include "data/layouts/Route104/layout.inc" - .include "data/layouts/Route105/layout.inc" - .include "data/layouts/Route106/layout.inc" - .include "data/layouts/Route107/layout.inc" - .include "data/layouts/Route108/layout.inc" - .include "data/layouts/Route109/layout.inc" - .include "data/layouts/Route110/layout.inc" - .include "data/layouts/Route111/layout.inc" - .include "data/layouts/Route112/layout.inc" - .include "data/layouts/Route113/layout.inc" - .include "data/layouts/Route114/layout.inc" - .include "data/layouts/Route115/layout.inc" - .include "data/layouts/Route116/layout.inc" - .include "data/layouts/Route117/layout.inc" - .include "data/layouts/Route118/layout.inc" - .include "data/layouts/Route119/layout.inc" - .include "data/layouts/Route120/layout.inc" - .include "data/layouts/Route121/layout.inc" - .include "data/layouts/Route122/layout.inc" - .include "data/layouts/Route123/layout.inc" - .include "data/layouts/Route124/layout.inc" - .include "data/layouts/Route125/layout.inc" - .include "data/layouts/Route126/layout.inc" - .include "data/layouts/Route127/layout.inc" - .include "data/layouts/Route128/layout.inc" - .include "data/layouts/Route129/layout.inc" - .include "data/layouts/UnknownMap_08417FC4/layout.inc" - .include "data/layouts/Route131/layout.inc" - .include "data/layouts/Route132/layout.inc" - .include "data/layouts/Route133/layout.inc" - .include "data/layouts/Route134/layout.inc" - .include "data/layouts/Underwater2/layout.inc" - .include "data/layouts/Underwater3/layout.inc" - .include "data/layouts/Underwater4/layout.inc" - .include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc" - .include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc" - .include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc" - .include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc" - .include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc" - .include "data/layouts/House1/layout.inc" - .include "data/layouts/House2/layout.inc" - .include "data/layouts/PokemonCenter_1F/layout.inc" - .include "data/layouts/PokemonCenter_2F/layout.inc" - .include "data/layouts/Mart/layout.inc" - .include "data/layouts/House3/layout.inc" - .include "data/layouts/DewfordTown_Gym/layout.inc" - .include "data/layouts/DewfordTown_Hall/layout.inc" - .include "data/layouts/House4/layout.inc" - .include "data/layouts/LavaridgeTown_HerbShop/layout.inc" - .include "data/layouts/LavaridgeTown_Gym_1F/layout.inc" - .include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc" - .include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc" - .include "data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc" - .include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc" - .include "data/layouts/LilycoveCity_House2/layout.inc" - .include "data/layouts/UnknownMap_08428450/layout.inc" - .include "data/layouts/VerdanturfTown_WandasHouse/layout.inc" - .include "data/layouts/PacifidlogTown_House1/layout.inc" - .include "data/layouts/PacifidlogTown_House2/layout.inc" - .include "data/layouts/PetalburgCity_Gym/layout.inc" - .include "data/layouts/HouseWithBed/layout.inc" - .include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc" - .include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc" - .include "data/layouts/UnknownMap_084294C4/layout.inc" - .include "data/layouts/UnknownMap_084294E8/layout.inc" - .include "data/layouts/SlateportCity_PokemonFanClub/layout.inc" - .include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc" - .include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc" - .include "data/layouts/Harbor/layout.inc" - .include "data/layouts/MauvilleCity_Gym/layout.inc" - .include "data/layouts/MauvilleCity_BikeShop/layout.inc" - .include "data/layouts/MauvilleCity_GameCorner/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc" - .include "data/layouts/RustboroCity_Gym/layout.inc" - .include "data/layouts/RustboroCity_PokemonSchool/layout.inc" - .include "data/layouts/RustboroCity_House/layout.inc" - .include "data/layouts/RustboroCity_House1/layout.inc" - .include "data/layouts/RustboroCity_CuttersHouse/layout.inc" - .include "data/layouts/FortreeCity_House1/layout.inc" - .include "data/layouts/FortreeCity_Gym/layout.inc" - .include "data/layouts/FortreeCity_House2/layout.inc" - .include "data/layouts/Route104_MrBrineysHouse/layout.inc" - .include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc" - .include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc" - .include "data/layouts/LilycoveCity_ContestLobby/layout.inc" - .include "data/layouts/LilycoveCity_ContestHall/layout.inc" - .include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc" - .include "data/layouts/MossdeepCity_Gym/layout.inc" - .include "data/layouts/SootopolisCity_Gym_1F/layout.inc" - .include "data/layouts/SootopolisCity_Gym_B1F/layout.inc" - .include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc" - .include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc" - .include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc" - .include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc" - .include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc" - .include "data/layouts/EverGrandeCity_ShortHall/layout.inc" - .include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc" - .include "data/layouts/CableCarStation/layout.inc" - .include "data/layouts/Route114_FossilManiacsHouse/layout.inc" - .include "data/layouts/Route114_FossilManiacsTunnel/layout.inc" - .include "data/layouts/Route114_LanettesHouse/layout.inc" - .include "data/layouts/Route116_TunnelersRestHouse/layout.inc" - .include "data/layouts/Route117_PokemonDayCare/layout.inc" - .include "data/layouts/Route121_SafariZoneEntrance/layout.inc" - .include "data/layouts/MeteorFalls_1F_1R/layout.inc" - .include "data/layouts/MeteorFalls_1F_2R/layout.inc" - .include "data/layouts/MeteorFalls_B1F_1R/layout.inc" - .include "data/layouts/MeteorFalls_B1F_2R/layout.inc" - .include "data/layouts/RusturfTunnel/layout.inc" - .include "data/layouts/Underwater_SootopolisCity/layout.inc" - .include "data/layouts/DesertRuins/layout.inc" - .include "data/layouts/GraniteCave_1F/layout.inc" - .include "data/layouts/GraniteCave_B1F/layout.inc" - .include "data/layouts/GraniteCave_B2F/layout.inc" - .include "data/layouts/PetalburgWoods/layout.inc" - .include "data/layouts/MtChimney/layout.inc" - .include "data/layouts/MtPyre_1F/layout.inc" - .include "data/layouts/MtPyre_2F/layout.inc" - .include "data/layouts/MtPyre_3F/layout.inc" - .include "data/layouts/MtPyre_4F/layout.inc" - .include "data/layouts/MtPyre_5F/layout.inc" - .include "data/layouts/MtPyre_6F/layout.inc" - .include "data/layouts/AquaHideout_1F/layout.inc" - .include "data/layouts/AquaHideout_B1F/layout.inc" - .include "data/layouts/AquaHideout_B2F/layout.inc" - .include "data/layouts/Underwater_SeafloorCavern/layout.inc" - .include "data/layouts/SeafloorCavern_Entrance/layout.inc" - .include "data/layouts/SeafloorCavern_Room1/layout.inc" - .include "data/layouts/SeafloorCavern_Room2/layout.inc" - .include "data/layouts/SeafloorCavern_Room3/layout.inc" - .include "data/layouts/SeafloorCavern_Room4/layout.inc" - .include "data/layouts/SeafloorCavern_Room5/layout.inc" - .include "data/layouts/SeafloorCavern_Room6/layout.inc" - .include "data/layouts/SeafloorCavern_Room7/layout.inc" - .include "data/layouts/SeafloorCavern_Room8/layout.inc" - .include "data/layouts/SeafloorCavern_Room9/layout.inc" - .include "data/layouts/CaveOfOrigin_Entrance/layout.inc" - .include "data/layouts/CaveOfOrigin_1F/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc" - .include "data/layouts/CaveOfOrigin_B1F/layout.inc" - .include "data/layouts/VictoryRoad_1F/layout.inc" - .include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc" - .include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc" - .include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc" - .include "data/layouts/UnknownMap_0843E6C0/layout.inc" - .include "data/layouts/UnknownMap_0843E6E4/layout.inc" - .include "data/layouts/UnknownMap_0843E708/layout.inc" - .include "data/layouts/UnknownMap_0843E72C/layout.inc" - .include "data/layouts/UnknownMap_0843E750/layout.inc" - .include "data/layouts/UnknownMap_0843E774/layout.inc" - .include "data/layouts/UnknownMap_0843E798/layout.inc" - .include "data/layouts/UnknownMap_0843E7BC/layout.inc" - .include "data/layouts/UnknownMap_0843E7E0/layout.inc" - .include "data/layouts/UnknownMap_0843E804/layout.inc" - .include "data/layouts/UnknownMap_0843E828/layout.inc" - .include "data/layouts/UnknownMap_0843E84C/layout.inc" - .include "data/layouts/UnknownMap_0843E870/layout.inc" - .include "data/layouts/UnknownMap_0843E894/layout.inc" - .include "data/layouts/NewMauville_Entrance/layout.inc" - .include "data/layouts/NewMauville_Inside/layout.inc" - .include "data/layouts/AbandonedShip_Deck/layout.inc" - .include "data/layouts/AbandonedShip_Corridors_1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms_1F/layout.inc" - .include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Underwater1/layout.inc" - .include "data/layouts/AbandonedShip_Room_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc" - .include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc" - .include "data/layouts/AbandonedShip_Underwater2/layout.inc" - .include "data/layouts/SecretBase_RedCave1/layout.inc" - .include "data/layouts/SecretBase_BrownCave1/layout.inc" - .include "data/layouts/SecretBase_BlueCave1/layout.inc" - .include "data/layouts/SecretBase_YellowCave1/layout.inc" - .include "data/layouts/SecretBase_Tree1/layout.inc" - .include "data/layouts/SecretBase_Shrub1/layout.inc" - .include "data/layouts/SecretBase_RedCave2/layout.inc" - .include "data/layouts/SecretBase_BrownCave2/layout.inc" - .include "data/layouts/SecretBase_BlueCave2/layout.inc" - .include "data/layouts/SecretBase_YellowCave2/layout.inc" - .include "data/layouts/SecretBase_Tree2/layout.inc" - .include "data/layouts/SecretBase_Shrub2/layout.inc" - .include "data/layouts/SecretBase_RedCave3/layout.inc" - .include "data/layouts/SecretBase_BrownCave3/layout.inc" - .include "data/layouts/SecretBase_BlueCave3/layout.inc" - .include "data/layouts/SecretBase_YellowCave3/layout.inc" - .include "data/layouts/SecretBase_Tree3/layout.inc" - .include "data/layouts/SecretBase_Shrub3/layout.inc" - .include "data/layouts/SecretBase_RedCave4/layout.inc" - .include "data/layouts/SecretBase_BrownCave4/layout.inc" - .include "data/layouts/SecretBase_BlueCave4/layout.inc" - .include "data/layouts/SecretBase_YellowCave4/layout.inc" - .include "data/layouts/SecretBase_Tree4/layout.inc" - .include "data/layouts/SecretBase_Shrub4/layout.inc" - .include "data/layouts/SingleBattleColosseum/layout.inc" - .include "data/layouts/TradeCenter/layout.inc" - .include "data/layouts/RecordCorner/layout.inc" - .include "data/layouts/DoubleBattleColosseum/layout.inc" - .include "data/layouts/LinkContestRoom1/layout.inc" - .include "data/layouts/UnknownMap_25_29/layout.inc" - .include "data/layouts/UnknownMap_25_30/layout.inc" - .include "data/layouts/UnknownMap_25_31/layout.inc" - .include "data/layouts/UnknownMap_25_32/layout.inc" - .include "data/layouts/UnknownMap_25_33/layout.inc" - .include "data/layouts/UnknownMap_25_34/layout.inc" - .include "data/layouts/LinkContestRoom2/layout.inc" - .include "data/layouts/LinkContestRoom3/layout.inc" - .include "data/layouts/LinkContestRoom4/layout.inc" - .include "data/layouts/LinkContestRoom5/layout.inc" - .include "data/layouts/LinkContestRoom6/layout.inc" - .include "data/layouts/InsideOfTruck/layout.inc" - .include "data/layouts/SafariZone_Northwest/layout.inc" - .include "data/layouts/SafariZone_North/layout.inc" - .include "data/layouts/SafariZone_Southwest/layout.inc" - .include "data/layouts/SafariZone_South/layout.inc" - .include "data/layouts/UnknownMap_08447028/layout.inc" - .include "data/layouts/Route109_SeashoreHouse/layout.inc" - .include "data/layouts/Route110_TrickHouseEntrance/layout.inc" - .include "data/layouts/Route110_TrickHouseEnd/layout.inc" - .include "data/layouts/Route110_TrickHouseCorridor/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle1/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle2/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle3/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle4/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle5/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle6/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle7/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle8/layout.inc" - .include "data/layouts/FortreeCity_DecorationShop/layout.inc" - .include "data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc" - .include "data/layouts/Route130/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerLobby/layout.inc" - .include "data/layouts/BattleFrontier_OutsideWest/layout.inc" - .include "data/layouts/BattleElevator/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc" - .include "data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc" - .include "data/layouts/Route119_WeatherInstitute_1F/layout.inc" - .include "data/layouts/Route119_WeatherInstitute_2F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc" - .include "data/layouts/Underwater1/layout.inc" - .include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc" - .include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc" - .include "data/layouts/SSTidalCorridor/layout.inc" - .include "data/layouts/SSTidalLowerDeck/layout.inc" - .include "data/layouts/SSTidalRooms/layout.inc" - .include "data/layouts/IslandCave/layout.inc" - .include "data/layouts/AncientTomb/layout.inc" - .include "data/layouts/Underwater_Route134/layout.inc" - .include "data/layouts/Underwater_SealedChamber/layout.inc" - .include "data/layouts/SealedChamber_OuterRoom/layout.inc" - .include "data/layouts/VictoryRoad_B1F/layout.inc" - .include "data/layouts/VictoryRoad_B2F/layout.inc" - .include "data/layouts/Route104_Prototype/layout.inc" - .include "data/layouts/GraniteCave_StevensRoom/layout.inc" - .include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc" - .include "data/layouts/SouthernIsland_Exterior/layout.inc" - .include "data/layouts/SouthernIsland_Interior/layout.inc" - .include "data/layouts/JaggedPass/layout.inc" - .include "data/layouts/FieryPath/layout.inc" - .include "data/layouts/RustboroCity_Flat2_1F/layout.inc" - .include "data/layouts/RustboroCity_Flat2_2F/layout.inc" - .include "data/layouts/RustboroCity_Flat2_3F/layout.inc" - .include "data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc" - .include "data/layouts/EverGrandeCity_HallOfFame/layout.inc" - .include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc" - .include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc" - .include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc" - .include "data/layouts/MtPyre_Exterior/layout.inc" - .include "data/layouts/MtPyre_Summit/layout.inc" - .include "data/layouts/SealedChamber_InnerRoom/layout.inc" - .include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc" - .include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc" - .include "data/layouts/SootopolisCity_House1/layout.inc" - .include "data/layouts/SootopolisCity_House2/layout.inc" - .include "data/layouts/SootopolisCity_House3/layout.inc" - .include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc" - .include "data/layouts/ScorchedSlab/layout.inc" - .include "data/layouts/UnknownMap_0845A394/layout.inc" - .include "data/layouts/RustboroCity_Flat1_1F/layout.inc" - .include "data/layouts/RustboroCity_Flat1_2F/layout.inc" - .include "data/layouts/EverGrandeCity_Hall4/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc" - .include "data/layouts/UnknownMap_0845D470/layout.inc" - .include "data/layouts/SkyPillar_Entrance/layout.inc" - .include "data/layouts/SkyPillar_Outside/layout.inc" - .include "data/layouts/SkyPillar_1F/layout.inc" - .include "data/layouts/SkyPillar_2F/layout.inc" - .include "data/layouts/SkyPillar_3F/layout.inc" - .include "data/layouts/SkyPillar_4F/layout.inc" - .include "data/layouts/UnknownMap_0845ECB4/layout.inc" - .include "data/layouts/MossdeepCity_StevensHouse/layout.inc" - .include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc" - .include "data/layouts/SafariZone_RestHouse/layout.inc" - .include "data/layouts/SkyPillar_5F/layout.inc" - .include "data/layouts/SkyPillar_Top/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc" - .include "data/layouts/MagmaHideout_1F/layout.inc" - .include "data/layouts/MagmaHideout_2F_1R/layout.inc" - .include "data/layouts/MagmaHideout_2F_2R/layout.inc" - .include "data/layouts/MagmaHideout_3F_1R/layout.inc" - .include "data/layouts/MagmaHideout_3F_2R/layout.inc" - .include "data/layouts/MagmaHideout_4F/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_OutsideEast/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc" - .include "data/layouts/UnknownMap_08469200/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc" - .include "data/layouts/UnknownMap_084693AC/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc" - .include "data/layouts/BattlePyramidSquare01/layout.inc" - .include "data/layouts/BattlePyramidSquare02/layout.inc" - .include "data/layouts/BattlePyramidSquare03/layout.inc" - .include "data/layouts/BattlePyramidSquare04/layout.inc" - .include "data/layouts/BattlePyramidSquare05/layout.inc" - .include "data/layouts/BattlePyramidSquare06/layout.inc" - .include "data/layouts/BattlePyramidSquare07/layout.inc" - .include "data/layouts/BattlePyramidSquare08/layout.inc" - .include "data/layouts/BattlePyramidSquare09/layout.inc" - .include "data/layouts/BattlePyramidSquare10/layout.inc" - .include "data/layouts/BattlePyramidSquare11/layout.inc" - .include "data/layouts/BattlePyramidSquare12/layout.inc" - .include "data/layouts/BattlePyramidSquare13/layout.inc" - .include "data/layouts/BattlePyramidSquare14/layout.inc" - .include "data/layouts/BattlePyramidSquare15/layout.inc" - .include "data/layouts/BattlePyramidSquare16/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc" - .include "data/layouts/MagmaHideout_3F_3R/layout.inc" - .include "data/layouts/MagmaHideout_2F_3R/layout.inc" - .include "data/layouts/MirageTower_1F/layout.inc" - .include "data/layouts/MirageTower_2F/layout.inc" - .include "data/layouts/MirageTower_3F/layout.inc" - .include "data/layouts/BattleTentLobby/layout.inc" - .include "data/layouts/BattleTentCorridor/layout.inc" - .include "data/layouts/BattleTentBattleRoom/layout.inc" - .include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc" - .include "data/layouts/MirageTower_4F/layout.inc" - .include "data/layouts/DesertUnderpass/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc" - .include "data/layouts/Route111_NoMirageTower/layout.inc" - .include "data/layouts/UnionRoom/layout.inc" - .include "data/layouts/SafariZone_Northeast/layout.inc" - .include "data/layouts/SafariZone_Southeast/layout.inc" - .include "data/layouts/BattleFrontier_RankingHall/layout.inc" - .include "data/layouts/BattleFrontier_Lounge1/layout.inc" - .include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc" - .include "data/layouts/BattleFrontier_ReceptionGate/layout.inc" - .include "data/layouts/ArtisanCave_B1F/layout.inc" - .include "data/layouts/ArtisanCave_1F/layout.inc" - .include "data/layouts/FarawayIsland_Entrance/layout.inc" - .include "data/layouts/FarawayIsland_Interior/layout.inc" - .include "data/layouts/BirthIsland_Exterior/layout.inc" - .include "data/layouts/IslandHarbor/layout.inc" - .include "data/layouts/Underwater_MarineCave/layout.inc" - .include "data/layouts/MarineCave_Entrance/layout.inc" - .include "data/layouts/TerraCave_Entrance/layout.inc" - .include "data/layouts/TerraCave_End/layout.inc" - .include "data/layouts/Underwater6/layout.inc" - .include "data/layouts/Underwater7/layout.inc" - .include "data/layouts/Underwater5/layout.inc" - .include "data/layouts/MarineCave_End/layout.inc" - .include "data/layouts/TrainerHill_Entrance/layout.inc" - .include "data/layouts/TrainerHill_1F/layout.inc" - .include "data/layouts/TrainerHill_2F/layout.inc" - .include "data/layouts/TrainerHill_3F/layout.inc" - .include "data/layouts/TrainerHill_4F/layout.inc" - .include "data/layouts/TrainerHill_Roof/layout.inc" - .include "data/layouts/AlteringCave/layout.inc" - .include "data/layouts/NavelRock_Exterior/layout.inc" - .include "data/layouts/NavelRock_Entrance/layout.inc" - .include "data/layouts/NavelRock_Top/layout.inc" - .include "data/layouts/NavelRock_Bottom/layout.inc" - .include "data/layouts/NavelRock_LadderRoom1/layout.inc" - .include "data/layouts/NavelRock_LadderRoom2/layout.inc" - .include "data/layouts/NavelRock_B1F/layout.inc" - .include "data/layouts/NavelRock_Fork/layout.inc" - .include "data/layouts/BattleFrontier_Lounge2/layout.inc" - .include "data/layouts/BattleFrontier_ScottsHouse/layout.inc" - .include "data/layouts/MeteorFalls_StevensCave/layout.inc" - .include "data/layouts/UnknownMap_08480DAC/layout.inc" - .include "data/layouts/UnknownMap_08480F54/layout.inc" - .include "data/layouts/UnknownMap_084810FC/layout.inc" - .include "data/layouts/UnknownMap_084812A4/layout.inc" - .include "data/layouts/UnknownMap_0848144C/layout.inc" - .include "data/layouts/UnknownMap_084815F4/layout.inc" - .include "data/layouts/UnknownMap_08481B24/layout.inc" - .include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc" - .include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc" - .include "data/layouts/UnknownMap_08481DBC/layout.inc" diff --git a/data/layouts/.gitignore b/data/layouts/.gitignore new file mode 100755 index 0000000000..eaa83a6f18 --- /dev/null +++ b/data/layouts/.gitignore @@ -0,0 +1,2 @@ +layouts.inc +layouts_table.inc diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc deleted file mode 100644 index d9e122ef20..0000000000 --- a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_CaptainsOffice_MapBorder:: - .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" - -AbandonedShip_CaptainsOffice_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" - - .align 2 -AbandonedShip_CaptainsOffice_Layout:: - .4byte 0x9 - .4byte 0x7 - .4byte AbandonedShip_CaptainsOffice_MapBorder - .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 deleted file mode 100644 index d5fd225782..0000000000 --- a/data/layouts/AbandonedShip_Corridors_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin" - -AbandonedShip_Corridors_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin" - - .align 2 -AbandonedShip_Corridors_1F_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte AbandonedShip_Corridors_1F_MapBorder - .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 deleted file mode 100644 index 7299aa6f89..0000000000 --- a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin" - -AbandonedShip_Corridors_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin" - - .align 2 -AbandonedShip_Corridors_B1F_Layout:: - .4byte 0xd - .4byte 0xa - .4byte AbandonedShip_Corridors_B1F_MapBorder - .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 deleted file mode 100644 index 7f0baaaec2..0000000000 --- a/data/layouts/AbandonedShip_Deck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Deck_MapBorder:: - .incbin "data/layouts/AbandonedShip_Deck/border.bin" - -AbandonedShip_Deck_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Deck/map.bin" - - .align 2 -AbandonedShip_Deck_Layout:: - .4byte 0x17 - .4byte 0x15 - .4byte AbandonedShip_Deck_MapBorder - .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 deleted file mode 100644 index 0ee7aa7556..0000000000 --- a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapBorder:: - .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" - -AbandonedShip_HiddenFloorCorridors_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_Layout:: - .4byte 0xd - .4byte 0xb - .4byte AbandonedShip_HiddenFloorCorridors_MapBorder - .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 deleted file mode 100644 index bf2f758d7a..0000000000 --- a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorRooms_MapBorder:: - .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" - -AbandonedShip_HiddenFloorRooms_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_Layout:: - .4byte 0x2c - .4byte 0xf - .4byte AbandonedShip_HiddenFloorRooms_MapBorder - .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 deleted file mode 100644 index fdd5b395d4..0000000000 --- a/data/layouts/AbandonedShip_Room_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Room_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin" - -AbandonedShip_Room_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin" - - .align 2 -AbandonedShip_Room_B1F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte AbandonedShip_Room_B1F_MapBorder - .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 deleted file mode 100644 index d15652cc07..0000000000 --- a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin" - -AbandonedShip_Rooms2_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_1F_Layout:: - .4byte 0x9 - .4byte 0x11 - .4byte AbandonedShip_Rooms2_1F_MapBorder - .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 deleted file mode 100644 index d99e43f473..0000000000 --- a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin" - -AbandonedShip_Rooms2_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte AbandonedShip_Rooms2_B1F_MapBorder - .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 deleted file mode 100644 index 63e4a716a3..0000000000 --- a/data/layouts/AbandonedShip_Rooms_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin" - -AbandonedShip_Rooms_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin" - - .align 2 -AbandonedShip_Rooms_1F_Layout:: - .4byte 0x12 - .4byte 0x11 - .4byte AbandonedShip_Rooms_1F_MapBorder - .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 deleted file mode 100644 index ab688d668a..0000000000 --- a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin" - -AbandonedShip_Rooms_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms_B1F_Layout:: - .4byte 0x1b - .4byte 0x8 - .4byte AbandonedShip_Rooms_B1F_MapBorder - .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 deleted file mode 100644 index 8fa1b14859..0000000000 --- a/data/layouts/AbandonedShip_Underwater1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater1_MapBorder:: - .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" - -AbandonedShip_Underwater1_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" - - .align 2 -AbandonedShip_Underwater1_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte AbandonedShip_Underwater1_MapBorder - .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 deleted file mode 100644 index feea82d163..0000000000 --- a/data/layouts/AbandonedShip_Underwater2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater2_MapBorder:: - .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" - -AbandonedShip_Underwater2_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" - - .align 2 -AbandonedShip_Underwater2_Layout:: - .4byte 0x15 - .4byte 0x7 - .4byte AbandonedShip_Underwater2_MapBorder - .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc deleted file mode 100644 index 9f03e7d871..0000000000 --- a/data/layouts/AlteringCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AlteringCave_MapBorder:: - .incbin "data/layouts/AlteringCave/border.bin" - -AlteringCave_MapBlockdata:: - .incbin "data/layouts/AlteringCave/map.bin" - - .align 2 -AlteringCave_Layout:: - .4byte 0x20 - .4byte 0x18 - .4byte AlteringCave_MapBorder - .4byte AlteringCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc deleted file mode 100644 index ad173f9360..0000000000 --- a/data/layouts/AncientTomb/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AncientTomb_MapBorder:: - .incbin "data/layouts/AncientTomb/border.bin" - -AncientTomb_MapBlockdata:: - .incbin "data/layouts/AncientTomb/map.bin" - - .align 2 -AncientTomb_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte AncientTomb_MapBorder - .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 deleted file mode 100644 index 5508a668b4..0000000000 --- a/data/layouts/AquaHideout_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_1F_MapBorder:: - .incbin "data/layouts/AquaHideout_1F/border.bin" - -AquaHideout_1F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_1F/map.bin" - - .align 2 -AquaHideout_1F_Layout:: - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_1F_MapBorder - .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 deleted file mode 100644 index 0889e548a8..0000000000 --- a/data/layouts/AquaHideout_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B1F_MapBorder:: - .incbin "data/layouts/AquaHideout_B1F/border.bin" - -AquaHideout_B1F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_B1F/map.bin" - - .align 2 -AquaHideout_B1F_Layout:: - .4byte 0x33 - .4byte 0x18 - .4byte AquaHideout_B1F_MapBorder - .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 deleted file mode 100644 index 9e335e5d92..0000000000 --- a/data/layouts/AquaHideout_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B2F_MapBorder:: - .incbin "data/layouts/AquaHideout_B2F/border.bin" - -AquaHideout_B2F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_B2F/map.bin" - - .align 2 -AquaHideout_B2F_Layout:: - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_B2F_MapBorder - .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 deleted file mode 100644 index 05862b275b..0000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" - -AquaHideout_UnusedRubyMap1_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap1_Layout:: - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_UnusedRubyMap1_MapBorder - .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 deleted file mode 100644 index e9e08ab97f..0000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" - -AquaHideout_UnusedRubyMap2_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap2_Layout:: - .4byte 0x3e - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap2_MapBorder - .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 deleted file mode 100644 index 44b35666f0..0000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" - -AquaHideout_UnusedRubyMap3_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap3_Layout:: - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap3_MapBorder - .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 deleted file mode 100644 index b32eef4221..0000000000 --- a/data/layouts/ArtisanCave_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_1F_MapBorder:: - .incbin "data/layouts/ArtisanCave_1F/border.bin" - -ArtisanCave_1F_MapBlockdata:: - .incbin "data/layouts/ArtisanCave_1F/map.bin" - - .align 2 -ArtisanCave_1F_Layout:: - .4byte 0x15 - .4byte 0x16 - .4byte ArtisanCave_1F_MapBorder - .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 deleted file mode 100644 index 2640303e34..0000000000 --- a/data/layouts/ArtisanCave_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_B1F_MapBorder:: - .incbin "data/layouts/ArtisanCave_B1F/border.bin" - -ArtisanCave_B1F_MapBlockdata:: - .incbin "data/layouts/ArtisanCave_B1F/map.bin" - - .align 2 -ArtisanCave_B1F_Layout:: - .4byte 0x2e - .4byte 0x36 - .4byte ArtisanCave_B1F_MapBorder - .4byte ArtisanCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc deleted file mode 100644 index 374af9ffad..0000000000 --- a/data/layouts/BattleElevator/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleElevator_MapBorder:: - .incbin "data/layouts/BattleElevator/border.bin" - -BattleElevator_MapBlockdata:: - .incbin "data/layouts/BattleElevator/map.bin" - - .align 2 -BattleElevator_Layout:: - .4byte 0x5 - .4byte 0x7 - .4byte BattleElevator_MapBorder - .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 deleted file mode 100644 index 89f799d84f..0000000000 --- a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" - -BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleArenaBattleRoom_Layout:: - .4byte 0x10 - .4byte 0xb - .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder - .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 deleted file mode 100644 index 8961ed7785..0000000000 --- a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" - -BattleFrontier_BattleArenaCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" - - .align 2 -BattleFrontier_BattleArenaCorridor_Layout:: - .4byte 0x12 - .4byte 0xe - .4byte BattleFrontier_BattleArenaCorridor_MapBorder - .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 deleted file mode 100644 index 305fcc0d97..0000000000 --- a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" - -BattleFrontier_BattleArenaLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" - - .align 2 -BattleFrontier_BattleArenaLobby_Layout:: - .4byte 0x10 - .4byte 0xd - .4byte BattleFrontier_BattleArenaLobby_MapBorder - .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 deleted file mode 100644 index a4991ae0c0..0000000000 --- a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" - -BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomeBattleRoom_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder - .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 deleted file mode 100644 index 7f3c93b827..0000000000 --- a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" - -BattleFrontier_BattleDomeCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" - - .align 2 -BattleFrontier_BattleDomeCorridor_Layout:: - .4byte 0x30 - .4byte 0x7 - .4byte BattleFrontier_BattleDomeCorridor_MapBorder - .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 deleted file mode 100644 index 2553e70987..0000000000 --- a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" - -BattleFrontier_BattleDomeLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" - - .align 2 -BattleFrontier_BattleDomeLobby_Layout:: - .4byte 0x17 - .4byte 0x11 - .4byte BattleFrontier_BattleDomeLobby_MapBorder - .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 deleted file mode 100644 index 8c0fe2ce5c..0000000000 --- a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" - -BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder - .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 deleted file mode 100644 index 21ba6a0156..0000000000 --- a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" - -BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_Layout:: - .4byte 0xd - .4byte 0xc - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder - .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 deleted file mode 100644 index cc0a336110..0000000000 --- a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" - -BattleFrontier_BattleFactoryLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" - - .align 2 -BattleFrontier_BattleFactoryLobby_Layout:: - .4byte 0x13 - .4byte 0xc - .4byte BattleFrontier_BattleFactoryLobby_MapBorder - .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 deleted file mode 100644 index fc4fc49bcc..0000000000 --- a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - -BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_Layout:: - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder - .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 deleted file mode 100644 index 3d9acc3c49..0000000000 --- a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" - -BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_Layout:: - .4byte 0xf - .4byte 0xa - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder - .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 deleted file mode 100644 index 2d16216c52..0000000000 --- a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" - -BattleFrontier_BattlePalaceCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePalaceCorridor_Layout:: - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattlePalaceCorridor_MapBorder - .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 deleted file mode 100644 index f9a1dad7b5..0000000000 --- a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" - -BattleFrontier_BattlePalaceLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" - - .align 2 -BattleFrontier_BattlePalaceLobby_Layout:: - .4byte 0x19 - .4byte 0xc - .4byte BattleFrontier_BattlePalaceLobby_MapBorder - .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 deleted file mode 100644 index 1d6d21778c..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" - -BattleFrontier_BattlePikeCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePikeCorridor_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte BattleFrontier_BattlePikeCorridor_MapBorder - .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 deleted file mode 100644 index 3a5cd35380..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" - -BattleFrontier_BattlePikeLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" - - .align 2 -BattleFrontier_BattlePikeLobby_Layout:: - .4byte 0xb - .4byte 0xd - .4byte BattleFrontier_BattlePikeLobby_MapBorder - .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 deleted file mode 100644 index 466ad0ff4e..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" - -BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder - .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 deleted file mode 100644 index 1c7fb35d45..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" - -BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_Layout:: - .4byte 0x5 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder - .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 deleted file mode 100644 index ce17a0bf68..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" - -BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_Layout:: - .4byte 0x9 - .4byte 0x14 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder - .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 deleted file mode 100644 index d7a082d13b..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" - -BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_Layout:: - .4byte 0xd - .4byte 0xb - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder - .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 deleted file mode 100644 index a65e7928b1..0000000000 --- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - -BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_Layout:: - .4byte 0xf - .4byte 0xb - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder - .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 deleted file mode 100644 index a9e779ddbe..0000000000 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" - -BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder - .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 deleted file mode 100644 index 28575776ac..0000000000 --- a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" - -BattleFrontier_BattlePyramidLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" - - .align 2 -BattleFrontier_BattlePyramidLobby_Layout:: - .4byte 0xf - .4byte 0x12 - .4byte BattleFrontier_BattlePyramidLobby_MapBorder - .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 deleted file mode 100644 index 4657c37a36..0000000000 --- a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidTop_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" - -BattleFrontier_BattlePyramidTop_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" - - .align 2 -BattleFrontier_BattlePyramidTop_Layout:: - .4byte 0x22 - .4byte 0x17 - .4byte BattleFrontier_BattlePyramidTop_MapBorder - .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 deleted file mode 100644 index 3d498239ae..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" - -BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerBattleRoom_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder - .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 deleted file mode 100644 index 56335aa234..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" - -BattleFrontier_BattleTowerCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor_Layout:: - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor_MapBorder - .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 deleted file mode 100644 index 7dba3777cd..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" - -BattleFrontier_BattleTowerCorridor2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor2_Layout:: - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor2_MapBorder - .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 deleted file mode 100644 index 790ff3bcd7..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" - -BattleFrontier_BattleTowerLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" - - .align 2 -BattleFrontier_BattleTowerLobby_Layout:: - .4byte 0x19 - .4byte 0xa - .4byte BattleFrontier_BattleTowerLobby_MapBorder - .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 deleted file mode 100644 index df5615873f..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - -BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder - .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 deleted file mode 100644 index c25b3b2a0f..0000000000 --- a/data/layouts/BattleFrontier_Lounge1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge1_MapBorder:: - .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" - -BattleFrontier_Lounge1_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" - - .align 2 -BattleFrontier_Lounge1_Layout:: - .4byte 0xd - .4byte 0x8 - .4byte BattleFrontier_Lounge1_MapBorder - .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 deleted file mode 100644 index b735b4994e..0000000000 --- a/data/layouts/BattleFrontier_Lounge2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge2_MapBorder:: - .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" - -BattleFrontier_Lounge2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" - - .align 2 -BattleFrontier_Lounge2_Layout:: - .4byte 0x9 - .4byte 0xa - .4byte BattleFrontier_Lounge2_MapBorder - .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 deleted file mode 100644 index ddaf204465..0000000000 --- a/data/layouts/BattleFrontier_OutsideEast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideEast_MapBorder:: - .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" - -BattleFrontier_OutsideEast_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" - - .align 2 -BattleFrontier_OutsideEast_Layout:: - .4byte 0x48 - .4byte 0x48 - .4byte BattleFrontier_OutsideEast_MapBorder - .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 deleted file mode 100644 index a506e554fb..0000000000 --- a/data/layouts/BattleFrontier_OutsideWest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideWest_MapBorder:: - .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" - -BattleFrontier_OutsideWest_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" - - .align 2 -BattleFrontier_OutsideWest_Layout:: - .4byte 0x38 - .4byte 0x48 - .4byte BattleFrontier_OutsideWest_MapBorder - .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 deleted file mode 100644 index d7615e693d..0000000000 --- a/data/layouts/BattleFrontier_RankingHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_RankingHall_MapBorder:: - .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" - -BattleFrontier_RankingHall_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" - - .align 2 -BattleFrontier_RankingHall_Layout:: - .4byte 0x35 - .4byte 0xf - .4byte BattleFrontier_RankingHall_MapBorder - .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 deleted file mode 100644 index 3dd4aeaa53..0000000000 --- a/data/layouts/BattleFrontier_ReceptionGate/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ReceptionGate_MapBorder:: - .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" - -BattleFrontier_ReceptionGate_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" - - .align 2 -BattleFrontier_ReceptionGate_Layout:: - .4byte 0x9 - .4byte 0xe - .4byte BattleFrontier_ReceptionGate_MapBorder - .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 deleted file mode 100644 index f087371096..0000000000 --- a/data/layouts/BattleFrontier_ScottsHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ScottsHouse_MapBorder:: - .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" - -BattleFrontier_ScottsHouse_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" - - .align 2 -BattleFrontier_ScottsHouse_Layout:: - .4byte 0x6 - .4byte 0x8 - .4byte BattleFrontier_ScottsHouse_MapBorder - .4byte BattleFrontier_ScottsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc deleted file mode 100644 index fe710cc404..0000000000 --- a/data/layouts/BattlePyramidSquare01/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare01_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare01/border.bin" - -BattlePyramidSquare01_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare01/map.bin" - - .align 2 -BattlePyramidSquare01_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare01_MapBorder - .4byte BattlePyramidSquare01_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc deleted file mode 100644 index 6aa5b7aa98..0000000000 --- a/data/layouts/BattlePyramidSquare02/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare02_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare02/border.bin" - -BattlePyramidSquare02_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare02/map.bin" - - .align 2 -BattlePyramidSquare02_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare02_MapBorder - .4byte BattlePyramidSquare02_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc deleted file mode 100644 index 4da41f9e9b..0000000000 --- a/data/layouts/BattlePyramidSquare03/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare03_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare03/border.bin" - -BattlePyramidSquare03_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare03/map.bin" - - .align 2 -BattlePyramidSquare03_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare03_MapBorder - .4byte BattlePyramidSquare03_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc deleted file mode 100644 index c298ee6f4e..0000000000 --- a/data/layouts/BattlePyramidSquare04/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare04_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare04/border.bin" - -BattlePyramidSquare04_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare04/map.bin" - - .align 2 -BattlePyramidSquare04_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare04_MapBorder - .4byte BattlePyramidSquare04_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc deleted file mode 100644 index 87ce532740..0000000000 --- a/data/layouts/BattlePyramidSquare05/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare05_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare05/border.bin" - -BattlePyramidSquare05_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare05/map.bin" - - .align 2 -BattlePyramidSquare05_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare05_MapBorder - .4byte BattlePyramidSquare05_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc deleted file mode 100644 index bcaeb89b01..0000000000 --- a/data/layouts/BattlePyramidSquare06/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare06_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare06/border.bin" - -BattlePyramidSquare06_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare06/map.bin" - - .align 2 -BattlePyramidSquare06_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare06_MapBorder - .4byte BattlePyramidSquare06_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc deleted file mode 100644 index bb469b3c81..0000000000 --- a/data/layouts/BattlePyramidSquare07/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare07_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare07/border.bin" - -BattlePyramidSquare07_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare07/map.bin" - - .align 2 -BattlePyramidSquare07_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare07_MapBorder - .4byte BattlePyramidSquare07_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc deleted file mode 100644 index df88b710fd..0000000000 --- a/data/layouts/BattlePyramidSquare08/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare08_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare08/border.bin" - -BattlePyramidSquare08_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare08/map.bin" - - .align 2 -BattlePyramidSquare08_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare08_MapBorder - .4byte BattlePyramidSquare08_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc deleted file mode 100644 index 2869d9ac25..0000000000 --- a/data/layouts/BattlePyramidSquare09/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare09_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare09/border.bin" - -BattlePyramidSquare09_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare09/map.bin" - - .align 2 -BattlePyramidSquare09_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare09_MapBorder - .4byte BattlePyramidSquare09_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc deleted file mode 100644 index 2ba8e8124d..0000000000 --- a/data/layouts/BattlePyramidSquare10/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare10_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare10/border.bin" - -BattlePyramidSquare10_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare10/map.bin" - - .align 2 -BattlePyramidSquare10_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare10_MapBorder - .4byte BattlePyramidSquare10_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc deleted file mode 100644 index 190bddf10b..0000000000 --- a/data/layouts/BattlePyramidSquare11/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare11_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare11/border.bin" - -BattlePyramidSquare11_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare11/map.bin" - - .align 2 -BattlePyramidSquare11_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare11_MapBorder - .4byte BattlePyramidSquare11_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc deleted file mode 100644 index 199f66aceb..0000000000 --- a/data/layouts/BattlePyramidSquare12/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare12_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare12/border.bin" - -BattlePyramidSquare12_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare12/map.bin" - - .align 2 -BattlePyramidSquare12_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare12_MapBorder - .4byte BattlePyramidSquare12_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc deleted file mode 100644 index 351b04227c..0000000000 --- a/data/layouts/BattlePyramidSquare13/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare13_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare13/border.bin" - -BattlePyramidSquare13_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare13/map.bin" - - .align 2 -BattlePyramidSquare13_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare13_MapBorder - .4byte BattlePyramidSquare13_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc deleted file mode 100644 index 653ad161b5..0000000000 --- a/data/layouts/BattlePyramidSquare14/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare14_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare14/border.bin" - -BattlePyramidSquare14_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare14/map.bin" - - .align 2 -BattlePyramidSquare14_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare14_MapBorder - .4byte BattlePyramidSquare14_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc deleted file mode 100644 index 24090c671e..0000000000 --- a/data/layouts/BattlePyramidSquare15/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare15_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare15/border.bin" - -BattlePyramidSquare15_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare15/map.bin" - - .align 2 -BattlePyramidSquare15_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare15_MapBorder - .4byte BattlePyramidSquare15_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc deleted file mode 100644 index 67187b9bf6..0000000000 --- a/data/layouts/BattlePyramidSquare16/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare16_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare16/border.bin" - -BattlePyramidSquare16_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare16/map.bin" - - .align 2 -BattlePyramidSquare16_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare16_MapBorder - .4byte BattlePyramidSquare16_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc deleted file mode 100644 index 4f9a8e6261..0000000000 --- a/data/layouts/BattleTentBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentBattleRoom_MapBorder:: - .incbin "data/layouts/BattleTentBattleRoom/border.bin" - -BattleTentBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleTentBattleRoom/map.bin" - - .align 2 -BattleTentBattleRoom_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte BattleTentBattleRoom_MapBorder - .4byte BattleTentBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc deleted file mode 100644 index 9abcdefa43..0000000000 --- a/data/layouts/BattleTentCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentCorridor_MapBorder:: - .incbin "data/layouts/BattleTentCorridor/border.bin" - -BattleTentCorridor_MapBlockdata:: - .incbin "data/layouts/BattleTentCorridor/map.bin" - - .align 2 -BattleTentCorridor_Layout:: - .4byte 0x5 - .4byte 0x8 - .4byte BattleTentCorridor_MapBorder - .4byte BattleTentCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc deleted file mode 100644 index a3216370f0..0000000000 --- a/data/layouts/BattleTentLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentLobby_MapBorder:: - .incbin "data/layouts/BattleTentLobby/border.bin" - -BattleTentLobby_MapBlockdata:: - .incbin "data/layouts/BattleTentLobby/map.bin" - - .align 2 -BattleTentLobby_Layout:: - .4byte 0xd - .4byte 0xa - .4byte BattleTentLobby_MapBorder - .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 deleted file mode 100644 index 17dc4f0fbd..0000000000 --- a/data/layouts/BirthIsland_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Exterior_MapBorder:: - .incbin "data/layouts/BirthIsland_Exterior/border.bin" - -BirthIsland_Exterior_MapBlockdata:: - .incbin "data/layouts/BirthIsland_Exterior/map.bin" - - .align 2 -BirthIsland_Exterior_Layout:: - .4byte 0x1e - .4byte 0x1e - .4byte BirthIsland_Exterior_MapBorder - .4byte BirthIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc deleted file mode 100644 index 1113f89f2e..0000000000 --- a/data/layouts/CableCarStation/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CableCarStation_MapBorder:: - .incbin "data/layouts/CableCarStation/border.bin" - -CableCarStation_MapBlockdata:: - .incbin "data/layouts/CableCarStation/map.bin" - - .align 2 -CableCarStation_Layout:: - .4byte 0xd - .4byte 0xc - .4byte CableCarStation_MapBorder - .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 deleted file mode 100644 index 616af16558..0000000000 --- a/data/layouts/CaveOfOrigin_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_1F_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_1F/border.bin" - -CaveOfOrigin_1F_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_1F/map.bin" - - .align 2 -CaveOfOrigin_1F_Layout:: - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_1F_MapBorder - .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 deleted file mode 100644 index 5850f15c90..0000000000 --- a/data/layouts/CaveOfOrigin_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_B1F_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" - -CaveOfOrigin_B1F_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" - - .align 2 -CaveOfOrigin_B1F_Layout:: - .4byte 0x13 - .4byte 0x13 - .4byte CaveOfOrigin_B1F_MapBorder - .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 deleted file mode 100644 index 11e230ce36..0000000000 --- a/data/layouts/CaveOfOrigin_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_Entrance_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" - -CaveOfOrigin_Entrance_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" - - .align 2 -CaveOfOrigin_Entrance_Layout:: - .4byte 0x13 - .4byte 0x1a - .4byte CaveOfOrigin_Entrance_MapBorder - .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 deleted file mode 100644 index 294bf786a2..0000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_Layout:: - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder - .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 deleted file mode 100644 index c3a05f75f7..0000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_Layout:: - .4byte 0x15 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder - .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 deleted file mode 100644 index cbc5c052a7..0000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_Layout:: - .4byte 0x13 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc deleted file mode 100644 index 4d6e7571ab..0000000000 --- a/data/layouts/DesertRuins/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertRuins_MapBorder:: - .incbin "data/layouts/DesertRuins/border.bin" - -DesertRuins_MapBlockdata:: - .incbin "data/layouts/DesertRuins/map.bin" - - .align 2 -DesertRuins_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte DesertRuins_MapBorder - .4byte DesertRuins_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc deleted file mode 100644 index 9a17a128e0..0000000000 --- a/data/layouts/DesertUnderpass/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertUnderpass_MapBorder:: - .incbin "data/layouts/DesertUnderpass/border.bin" - -DesertUnderpass_MapBlockdata:: - .incbin "data/layouts/DesertUnderpass/map.bin" - - .align 2 -DesertUnderpass_Layout:: - .4byte 0x8b - .4byte 0x17 - .4byte DesertUnderpass_MapBorder - .4byte DesertUnderpass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc deleted file mode 100644 index 28ccdc43c5..0000000000 --- a/data/layouts/DewfordTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_MapBorder:: - .incbin "data/layouts/DewfordTown/border.bin" - -DewfordTown_MapBlockdata:: - .incbin "data/layouts/DewfordTown/map.bin" - - .align 2 -DewfordTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte DewfordTown_MapBorder - .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 deleted file mode 100644 index bbada5bdc0..0000000000 --- a/data/layouts/DewfordTown_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Gym_MapBorder:: - .incbin "data/layouts/DewfordTown_Gym/border.bin" - -DewfordTown_Gym_MapBlockdata:: - .incbin "data/layouts/DewfordTown_Gym/map.bin" - - .align 2 -DewfordTown_Gym_Layout:: - .4byte 0x12 - .4byte 0x1c - .4byte DewfordTown_Gym_MapBorder - .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 deleted file mode 100644 index bd9cd03aec..0000000000 --- a/data/layouts/DewfordTown_Hall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Hall_MapBorder:: - .incbin "data/layouts/DewfordTown_Hall/border.bin" - -DewfordTown_Hall_MapBlockdata:: - .incbin "data/layouts/DewfordTown_Hall/map.bin" - - .align 2 -DewfordTown_Hall_Layout:: - .4byte 0x11 - .4byte 0x9 - .4byte DewfordTown_Hall_MapBorder - .4byte DewfordTown_Hall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc deleted file mode 100644 index 61d112c1e9..0000000000 --- a/data/layouts/DoubleBattleColosseum/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum_MapBorder:: - .incbin "data/layouts/DoubleBattleColosseum/border.bin" - -DoubleBattleColosseum_MapBlockdata:: - .incbin "data/layouts/DoubleBattleColosseum/map.bin" - - .align 2 -DoubleBattleColosseum_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte DoubleBattleColosseum_MapBorder - .4byte DoubleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc deleted file mode 100644 index 16c02fbaac..0000000000 --- a/data/layouts/EverGrandeCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_MapBorder:: - .incbin "data/layouts/EverGrandeCity/border.bin" - -EverGrandeCity_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity/map.bin" - - .align 2 -EverGrandeCity_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte EverGrandeCity_MapBorder - .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 deleted file mode 100644 index dad4c7ef35..0000000000 --- a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ChampionsRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" - -EverGrandeCity_ChampionsRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_Layout:: - .4byte 0xd - .4byte 0xd - .4byte EverGrandeCity_ChampionsRoom_MapBorder - .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 deleted file mode 100644 index 9c140d49d3..0000000000 --- a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_DrakesRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" - -EverGrandeCity_DrakesRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" - - .align 2 -EverGrandeCity_DrakesRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_DrakesRoom_MapBorder - .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 deleted file mode 100644 index bcd610d8c8..0000000000 --- a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_GlaciasRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" - -EverGrandeCity_GlaciasRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_GlaciasRoom_MapBorder - .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 deleted file mode 100644 index 464fc8998f..0000000000 --- a/data/layouts/EverGrandeCity_Hall4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall4_MapBorder:: - .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" - -EverGrandeCity_Hall4_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" - - .align 2 -EverGrandeCity_Hall4_Layout:: - .4byte 0xb - .4byte 0x22 - .4byte EverGrandeCity_Hall4_MapBorder - .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 deleted file mode 100644 index deaa4429d1..0000000000 --- a/data/layouts/EverGrandeCity_HallOfFame/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_HallOfFame_MapBorder:: - .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" - -EverGrandeCity_HallOfFame_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" - - .align 2 -EverGrandeCity_HallOfFame_Layout:: - .4byte 0xf - .4byte 0x11 - .4byte EverGrandeCity_HallOfFame_MapBorder - .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 deleted file mode 100644 index b02d5c312c..0000000000 --- a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PhoebesRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" - -EverGrandeCity_PhoebesRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_PhoebesRoom_MapBorder - .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 deleted file mode 100644 index d84e6449f7..0000000000 --- a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_1F_MapBorder:: - .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin" - -EverGrandeCity_PokemonLeague_1F_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" - - .align 2 -EverGrandeCity_PokemonLeague_1F_Layout:: - .4byte 0x13 - .4byte 0xc - .4byte EverGrandeCity_PokemonLeague_1F_MapBorder - .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 deleted file mode 100644 index 2159c894d3..0000000000 --- a/data/layouts/EverGrandeCity_ShortHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ShortHall_MapBorder:: - .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" - -EverGrandeCity_ShortHall_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" - - .align 2 -EverGrandeCity_ShortHall_Layout:: - .4byte 0xb - .4byte 0xd - .4byte EverGrandeCity_ShortHall_MapBorder - .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 deleted file mode 100644 index 86ffa16a15..0000000000 --- a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_SidneysRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" - -EverGrandeCity_SidneysRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" - - .align 2 -EverGrandeCity_SidneysRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_SidneysRoom_MapBorder - .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc deleted file mode 100644 index 7f08949032..0000000000 --- a/data/layouts/FallarborTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_MapBorder:: - .incbin "data/layouts/FallarborTown/border.bin" - -FallarborTown_MapBlockdata:: - .incbin "data/layouts/FallarborTown/map.bin" - - .align 2 -FallarborTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte FallarborTown_MapBorder - .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 deleted file mode 100644 index 66acc546b4..0000000000 --- a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_LeftoverRSContestHall_MapBorder:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" - -FallarborTown_LeftoverRSContestHall_MapBlockdata:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestHall_Layout:: - .4byte 0x15 - .4byte 0x12 - .4byte FallarborTown_LeftoverRSContestHall_MapBorder - .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 deleted file mode 100644 index 3ad232728e..0000000000 --- a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_LeftoverRSContestLobby_MapBorder:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" - -FallarborTown_LeftoverRSContestLobby_MapBlockdata:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestLobby_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte FallarborTown_LeftoverRSContestLobby_MapBorder - .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 deleted file mode 100644 index c7d6bef917..0000000000 --- a/data/layouts/FarawayIsland_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Entrance_MapBorder:: - .incbin "data/layouts/FarawayIsland_Entrance/border.bin" - -FarawayIsland_Entrance_MapBlockdata:: - .incbin "data/layouts/FarawayIsland_Entrance/map.bin" - - .align 2 -FarawayIsland_Entrance_Layout:: - .4byte 0x22 - .4byte 0x2e - .4byte FarawayIsland_Entrance_MapBorder - .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 deleted file mode 100644 index 787dd53c9e..0000000000 --- a/data/layouts/FarawayIsland_Interior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Interior_MapBorder:: - .incbin "data/layouts/FarawayIsland_Interior/border.bin" - -FarawayIsland_Interior_MapBlockdata:: - .incbin "data/layouts/FarawayIsland_Interior/map.bin" - - .align 2 -FarawayIsland_Interior_Layout:: - .4byte 0x1d - .4byte 0x1a - .4byte FarawayIsland_Interior_MapBorder - .4byte FarawayIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc deleted file mode 100644 index c129ae7150..0000000000 --- a/data/layouts/FieryPath/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FieryPath_MapBorder:: - .incbin "data/layouts/FieryPath/border.bin" - -FieryPath_MapBlockdata:: - .incbin "data/layouts/FieryPath/map.bin" - - .align 2 -FieryPath_Layout:: - .4byte 0x23 - .4byte 0x26 - .4byte FieryPath_MapBorder - .4byte FieryPath_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc deleted file mode 100644 index 02564b36ad..0000000000 --- a/data/layouts/FortreeCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_MapBorder:: - .incbin "data/layouts/FortreeCity/border.bin" - -FortreeCity_MapBlockdata:: - .incbin "data/layouts/FortreeCity/map.bin" - - .align 2 -FortreeCity_Layout:: - .4byte 0x28 - .4byte 0x14 - .4byte FortreeCity_MapBorder - .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 deleted file mode 100644 index 6460a35b54..0000000000 --- a/data/layouts/FortreeCity_DecorationShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_DecorationShop_MapBorder:: - .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" - -FortreeCity_DecorationShop_MapBlockdata:: - .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" - - .align 2 -FortreeCity_DecorationShop_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_DecorationShop_MapBorder - .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 deleted file mode 100644 index da7f1e73e9..0000000000 --- a/data/layouts/FortreeCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Gym_MapBorder:: - .incbin "data/layouts/FortreeCity_Gym/border.bin" - -FortreeCity_Gym_MapBlockdata:: - .incbin "data/layouts/FortreeCity_Gym/map.bin" - - .align 2 -FortreeCity_Gym_Layout:: - .4byte 0x14 - .4byte 0x19 - .4byte FortreeCity_Gym_MapBorder - .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 deleted file mode 100644 index 214846c228..0000000000 --- a/data/layouts/FortreeCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House1_MapBorder:: - .incbin "data/layouts/FortreeCity_House1/border.bin" - -FortreeCity_House1_MapBlockdata:: - .incbin "data/layouts/FortreeCity_House1/map.bin" - - .align 2 -FortreeCity_House1_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House1_MapBorder - .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 deleted file mode 100644 index 3aa0898bfe..0000000000 --- a/data/layouts/FortreeCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House2_MapBorder:: - .incbin "data/layouts/FortreeCity_House2/border.bin" - -FortreeCity_House2_MapBlockdata:: - .incbin "data/layouts/FortreeCity_House2/map.bin" - - .align 2 -FortreeCity_House2_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House2_MapBorder - .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 deleted file mode 100644 index 009fd12f5c..0000000000 --- a/data/layouts/GraniteCave_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_1F_MapBorder:: - .incbin "data/layouts/GraniteCave_1F/border.bin" - -GraniteCave_1F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_1F/map.bin" - - .align 2 -GraniteCave_1F_Layout:: - .4byte 0x2a - .4byte 0xf - .4byte GraniteCave_1F_MapBorder - .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 deleted file mode 100644 index a57b238be1..0000000000 --- a/data/layouts/GraniteCave_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F_MapBorder:: - .incbin "data/layouts/GraniteCave_B1F/border.bin" - -GraniteCave_B1F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_B1F/map.bin" - - .align 2 -GraniteCave_B1F_Layout:: - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B1F_MapBorder - .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 deleted file mode 100644 index 7ffd04b001..0000000000 --- a/data/layouts/GraniteCave_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B2F_MapBorder:: - .incbin "data/layouts/GraniteCave_B2F/border.bin" - -GraniteCave_B2F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_B2F/map.bin" - - .align 2 -GraniteCave_B2F_Layout:: - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B2F_MapBorder - .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 deleted file mode 100644 index 5ee4fade44..0000000000 --- a/data/layouts/GraniteCave_StevensRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_StevensRoom_MapBorder:: - .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" - -GraniteCave_StevensRoom_MapBlockdata:: - .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" - - .align 2 -GraniteCave_StevensRoom_Layout:: - .4byte 0xf - .4byte 0xe - .4byte GraniteCave_StevensRoom_MapBorder - .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc deleted file mode 100644 index e95b8ec9d7..0000000000 --- a/data/layouts/Harbor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Harbor_MapBorder:: - .incbin "data/layouts/Harbor/border.bin" - -Harbor_MapBlockdata:: - .incbin "data/layouts/Harbor/map.bin" - - .align 2 -Harbor_Layout:: - .4byte 0x18 - .4byte 0xf - .4byte Harbor_MapBorder - .4byte Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc deleted file mode 100644 index b93f24df4f..0000000000 --- a/data/layouts/House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House1_MapBorder:: - .incbin "data/layouts/House1/border.bin" - -House1_MapBlockdata:: - .incbin "data/layouts/House1/map.bin" - - .align 2 -House1_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte House1_MapBorder - .4byte House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc deleted file mode 100644 index 35566d8d12..0000000000 --- a/data/layouts/House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House2_MapBorder:: - .incbin "data/layouts/House2/border.bin" - -House2_MapBlockdata:: - .incbin "data/layouts/House2/map.bin" - - .align 2 -House2_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte House2_MapBorder - .4byte House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc deleted file mode 100644 index 6e2de11f48..0000000000 --- a/data/layouts/House3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House3_MapBorder:: - .incbin "data/layouts/House3/border.bin" - -House3_MapBlockdata:: - .incbin "data/layouts/House3/map.bin" - - .align 2 -House3_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte House3_MapBorder - .4byte House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc deleted file mode 100644 index b06b3d4273..0000000000 --- a/data/layouts/House4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House4_MapBorder:: - .incbin "data/layouts/House4/border.bin" - -House4_MapBlockdata:: - .incbin "data/layouts/House4/map.bin" - - .align 2 -House4_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte House4_MapBorder - .4byte House4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc deleted file mode 100644 index 7fb8d2c9bd..0000000000 --- a/data/layouts/HouseWithBed/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -HouseWithBed_MapBorder:: - .incbin "data/layouts/HouseWithBed/border.bin" - -HouseWithBed_MapBlockdata:: - .incbin "data/layouts/HouseWithBed/map.bin" - - .align 2 -HouseWithBed_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte HouseWithBed_MapBorder - .4byte HouseWithBed_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc deleted file mode 100644 index d1ddf86865..0000000000 --- a/data/layouts/InsideOfTruck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -InsideOfTruck_MapBorder:: - .incbin "data/layouts/InsideOfTruck/border.bin" - -InsideOfTruck_MapBlockdata:: - .incbin "data/layouts/InsideOfTruck/map.bin" - - .align 2 -InsideOfTruck_Layout:: - .4byte 0x5 - .4byte 0x5 - .4byte InsideOfTruck_MapBorder - .4byte InsideOfTruck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideOfTruck - diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc deleted file mode 100644 index 5a3035b721..0000000000 --- a/data/layouts/IslandCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandCave_MapBorder:: - .incbin "data/layouts/IslandCave/border.bin" - -IslandCave_MapBlockdata:: - .incbin "data/layouts/IslandCave/map.bin" - - .align 2 -IslandCave_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte IslandCave_MapBorder - .4byte IslandCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc deleted file mode 100644 index 7fc86dca44..0000000000 --- a/data/layouts/IslandHarbor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandHarbor_MapBorder:: - .incbin "data/layouts/IslandHarbor/border.bin" - -IslandHarbor_MapBlockdata:: - .incbin "data/layouts/IslandHarbor/map.bin" - - .align 2 -IslandHarbor_Layout:: - .4byte 0x11 - .4byte 0xd - .4byte IslandHarbor_MapBorder - .4byte IslandHarbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_IslandHarbor - diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc deleted file mode 100644 index 5620551b8a..0000000000 --- a/data/layouts/JaggedPass/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -JaggedPass_MapBorder:: - .incbin "data/layouts/JaggedPass/border.bin" - -JaggedPass_MapBlockdata:: - .incbin "data/layouts/JaggedPass/map.bin" - - .align 2 -JaggedPass_Layout:: - .4byte 0x1e - .4byte 0x2e - .4byte JaggedPass_MapBorder - .4byte JaggedPass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc deleted file mode 100644 index 6629554306..0000000000 --- a/data/layouts/LavaridgeTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_MapBorder:: - .incbin "data/layouts/LavaridgeTown/border.bin" - -LavaridgeTown_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown/map.bin" - - .align 2 -LavaridgeTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte LavaridgeTown_MapBorder - .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 deleted file mode 100644 index 36f4cb826a..0000000000 --- a/data/layouts/LavaridgeTown_Gym_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin" - -LavaridgeTown_Gym_1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin" - - .align 2 -LavaridgeTown_Gym_1F_Layout:: - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_1F_MapBorder - .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 deleted file mode 100644 index 9b80d7f90f..0000000000 --- a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_B1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin" - -LavaridgeTown_Gym_B1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin" - - .align 2 -LavaridgeTown_Gym_B1F_Layout:: - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_B1F_MapBorder - .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 deleted file mode 100644 index c59e12e49c..0000000000 --- a/data/layouts/LavaridgeTown_HerbShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_HerbShop_MapBorder:: - .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" - -LavaridgeTown_HerbShop_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" - - .align 2 -LavaridgeTown_HerbShop_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte LavaridgeTown_HerbShop_MapBorder - .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 deleted file mode 100644 index e38d63815f..0000000000 --- a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin" - -LavaridgeTown_PokemonCenter_1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte LavaridgeTown_PokemonCenter_1F_MapBorder - .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 deleted file mode 100644 index ed4bd81e4a..0000000000 --- a/data/layouts/LilycoveCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_MapBorder:: - .incbin "data/layouts/LilycoveCity/border.bin" - -LilycoveCity_MapBlockdata:: - .incbin "data/layouts/LilycoveCity/map.bin" - - .align 2 -LilycoveCity_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte LilycoveCity_MapBorder - .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 deleted file mode 100644 index 61e6e27ee5..0000000000 --- a/data/layouts/LilycoveCity_ContestHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestHall_MapBorder:: - .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" - -LilycoveCity_ContestHall_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" - - .align 2 -LilycoveCity_ContestHall_Layout:: - .4byte 0x33 - .4byte 0x21 - .4byte LilycoveCity_ContestHall_MapBorder - .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 deleted file mode 100644 index 20cf4389fb..0000000000 --- a/data/layouts/LilycoveCity_ContestLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestLobby_MapBorder:: - .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" - -LilycoveCity_ContestLobby_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" - - .align 2 -LilycoveCity_ContestLobby_Layout:: - .4byte 0x1f - .4byte 0xc - .4byte LilycoveCity_ContestLobby_MapBorder - .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 deleted file mode 100644 index b275834f7e..0000000000 --- a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin" - -LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder - .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 deleted file mode 100644 index 82a294c48f..0000000000 --- a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin" - -LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder - .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 deleted file mode 100644 index 899e934bdb..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" - -LilycoveCity_DepartmentStoreElevator_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_Layout:: - .4byte 0x5 - .4byte 0x6 - .4byte LilycoveCity_DepartmentStoreElevator_MapBorder - .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 deleted file mode 100644 index d404833086..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" - -LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder - .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 deleted file mode 100644 index d3b5d94207..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin" - -LilycoveCity_DepartmentStore_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_1F_MapBorder - .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 deleted file mode 100644 index e5b01c8fd7..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin" - -LilycoveCity_DepartmentStore_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_2F_MapBorder - .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 deleted file mode 100644 index 5d7aa93ebe..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin" - -LilycoveCity_DepartmentStore_3F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_3F_MapBorder - .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 deleted file mode 100644 index b4585ca031..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin" - -LilycoveCity_DepartmentStore_4F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_4F_MapBorder - .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 deleted file mode 100644 index ade5e4bf51..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_5F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin" - -LilycoveCity_DepartmentStore_5F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_5F_MapBorder - .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 deleted file mode 100644 index de51e7fd61..0000000000 --- a/data/layouts/LilycoveCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House2_MapBorder:: - .incbin "data/layouts/LilycoveCity_House2/border.bin" - -LilycoveCity_House2_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_House2/map.bin" - - .align 2 -LilycoveCity_House2_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte LilycoveCity_House2_MapBorder - .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 deleted file mode 100644 index 0dab4095ce..0000000000 --- a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin" - -LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_Layout:: - .4byte 0x15 - .4byte 0xe - .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder - .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 deleted file mode 100644 index aea4464109..0000000000 --- a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin" - -LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_Layout:: - .4byte 0x16 - .4byte 0xd - .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder - .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 deleted file mode 100644 index 9b30c7c08e..0000000000 --- a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_MapBorder:: - .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" - -LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_Layout:: - .4byte 0xc - .4byte 0xe - .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder - .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc deleted file mode 100644 index e71fe2df32..0000000000 --- a/data/layouts/LinkContestRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom1_MapBorder:: - .incbin "data/layouts/LinkContestRoom1/border.bin" - -LinkContestRoom1_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom1/map.bin" - - .align 2 -LinkContestRoom1_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom1_MapBorder - .4byte LinkContestRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc deleted file mode 100644 index 2dd66ab962..0000000000 --- a/data/layouts/LinkContestRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom2_MapBorder:: - .incbin "data/layouts/LinkContestRoom2/border.bin" - -LinkContestRoom2_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom2/map.bin" - - .align 2 -LinkContestRoom2_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom2_MapBorder - .4byte LinkContestRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc deleted file mode 100644 index c53cad7230..0000000000 --- a/data/layouts/LinkContestRoom3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom3_MapBorder:: - .incbin "data/layouts/LinkContestRoom3/border.bin" - -LinkContestRoom3_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom3/map.bin" - - .align 2 -LinkContestRoom3_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom3_MapBorder - .4byte LinkContestRoom3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc deleted file mode 100644 index 883918f377..0000000000 --- a/data/layouts/LinkContestRoom4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom4_MapBorder:: - .incbin "data/layouts/LinkContestRoom4/border.bin" - -LinkContestRoom4_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom4/map.bin" - - .align 2 -LinkContestRoom4_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom4_MapBorder - .4byte LinkContestRoom4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc deleted file mode 100644 index 72a9d9f4ed..0000000000 --- a/data/layouts/LinkContestRoom5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom5_MapBorder:: - .incbin "data/layouts/LinkContestRoom5/border.bin" - -LinkContestRoom5_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom5/map.bin" - - .align 2 -LinkContestRoom5_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom5_MapBorder - .4byte LinkContestRoom5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc deleted file mode 100644 index 33db4b56dc..0000000000 --- a/data/layouts/LinkContestRoom6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom6_MapBorder:: - .incbin "data/layouts/LinkContestRoom6/border.bin" - -LinkContestRoom6_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom6/map.bin" - - .align 2 -LinkContestRoom6_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom6_MapBorder - .4byte LinkContestRoom6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc deleted file mode 100644 index 8193ac6956..0000000000 --- a/data/layouts/LittlerootTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MapBorder:: - .incbin "data/layouts/LittlerootTown/border.bin" - -LittlerootTown_MapBlockdata:: - .incbin "data/layouts/LittlerootTown/map.bin" - - .align 2 -LittlerootTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte LittlerootTown_MapBorder - .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 deleted file mode 100644 index 092c7d20b3..0000000000 --- a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_1F_MapBorder:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin" - -LittlerootTown_BrendansHouse_1F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_BrendansHouse_1F_MapBorder - .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 deleted file mode 100644 index 5235f4d986..0000000000 --- a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_2F_MapBorder:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin" - -LittlerootTown_BrendansHouse_2F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_BrendansHouse_2F_MapBorder - .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 deleted file mode 100644 index 88b81a289a..0000000000 --- a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_1F_MapBorder:: - .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin" - -LittlerootTown_MaysHouse_1F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_MaysHouse_1F_MapBorder - .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 deleted file mode 100644 index 0b6134dbd9..0000000000 --- a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_2F_MapBorder:: - .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin" - -LittlerootTown_MaysHouse_2F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_MaysHouse_2F_MapBorder - .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 deleted file mode 100644 index d0be539a0f..0000000000 --- a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_MapBorder:: - .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" - -LittlerootTown_ProfessorBirchsLab_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_Layout:: - .4byte 0xd - .4byte 0xd - .4byte LittlerootTown_ProfessorBirchsLab_MapBorder - .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 deleted file mode 100644 index b50c7f015f..0000000000 --- a/data/layouts/MagmaHideout_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_1F_MapBorder:: - .incbin "data/layouts/MagmaHideout_1F/border.bin" - -MagmaHideout_1F_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_1F/map.bin" - - .align 2 -MagmaHideout_1F_Layout:: - .4byte 0x25 - .4byte 0x26 - .4byte MagmaHideout_1F_MapBorder - .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 deleted file mode 100644 index b9f0d27d7e..0000000000 --- a/data/layouts/MagmaHideout_2F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_1R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_1R/border.bin" - -MagmaHideout_2F_1R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_1R/map.bin" - - .align 2 -MagmaHideout_2F_1R_Layout:: - .4byte 0x21 - .4byte 0x27 - .4byte MagmaHideout_2F_1R_MapBorder - .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 deleted file mode 100644 index 01507909c1..0000000000 --- a/data/layouts/MagmaHideout_2F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_2R/border.bin" - -MagmaHideout_2F_2R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_2R/map.bin" - - .align 2 -MagmaHideout_2F_2R_Layout:: - .4byte 0x31 - .4byte 0x1c - .4byte MagmaHideout_2F_2R_MapBorder - .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 deleted file mode 100644 index d88fb50fd0..0000000000 --- a/data/layouts/MagmaHideout_2F_3R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_3R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_3R/border.bin" - -MagmaHideout_2F_3R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_3R/map.bin" - - .align 2 -MagmaHideout_2F_3R_Layout:: - .4byte 0x3c - .4byte 0x13 - .4byte MagmaHideout_2F_3R_MapBorder - .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 deleted file mode 100644 index c2199b2f2e..0000000000 --- a/data/layouts/MagmaHideout_3F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_1R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_1R/border.bin" - -MagmaHideout_3F_1R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_1R/map.bin" - - .align 2 -MagmaHideout_3F_1R_Layout:: - .4byte 0x1c - .4byte 0x18 - .4byte MagmaHideout_3F_1R_MapBorder - .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 deleted file mode 100644 index 2c4662a49d..0000000000 --- a/data/layouts/MagmaHideout_3F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_2R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_2R/border.bin" - -MagmaHideout_3F_2R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_2R/map.bin" - - .align 2 -MagmaHideout_3F_2R_Layout:: - .4byte 0x18 - .4byte 0x11 - .4byte MagmaHideout_3F_2R_MapBorder - .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 deleted file mode 100644 index 4042b9653b..0000000000 --- a/data/layouts/MagmaHideout_3F_3R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_3R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_3R/border.bin" - -MagmaHideout_3F_3R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_3R/map.bin" - - .align 2 -MagmaHideout_3F_3R_Layout:: - .4byte 0x21 - .4byte 0x18 - .4byte MagmaHideout_3F_3R_MapBorder - .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 deleted file mode 100644 index d7f8c547ca..0000000000 --- a/data/layouts/MagmaHideout_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_4F_MapBorder:: - .incbin "data/layouts/MagmaHideout_4F/border.bin" - -MagmaHideout_4F_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_4F/map.bin" - - .align 2 -MagmaHideout_4F_Layout:: - .4byte 0x3b - .4byte 0x1c - .4byte MagmaHideout_4F_MapBorder - .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 deleted file mode 100644 index 256338b897..0000000000 --- a/data/layouts/MarineCave_End/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_End_MapBorder:: - .incbin "data/layouts/MarineCave_End/border.bin" - -MarineCave_End_MapBlockdata:: - .incbin "data/layouts/MarineCave_End/map.bin" - - .align 2 -MarineCave_End_Layout:: - .4byte 0x1b - .4byte 0x1e - .4byte MarineCave_End_MapBorder - .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 deleted file mode 100644 index 219c182d79..0000000000 --- a/data/layouts/MarineCave_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_Entrance_MapBorder:: - .incbin "data/layouts/MarineCave_Entrance/border.bin" - -MarineCave_Entrance_MapBlockdata:: - .incbin "data/layouts/MarineCave_Entrance/map.bin" - - .align 2 -MarineCave_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte MarineCave_Entrance_MapBorder - .4byte MarineCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc deleted file mode 100644 index 5233e09ab0..0000000000 --- a/data/layouts/Mart/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Mart_MapBorder:: - .incbin "data/layouts/Mart/border.bin" - -Mart_MapBlockdata:: - .incbin "data/layouts/Mart/map.bin" - - .align 2 -Mart_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte Mart_MapBorder - .4byte Mart_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc deleted file mode 100644 index 7a8c17da2e..0000000000 --- a/data/layouts/MauvilleCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_MapBorder:: - .incbin "data/layouts/MauvilleCity/border.bin" - -MauvilleCity_MapBlockdata:: - .incbin "data/layouts/MauvilleCity/map.bin" - - .align 2 -MauvilleCity_Layout:: - .4byte 0x28 - .4byte 0x14 - .4byte MauvilleCity_MapBorder - .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 deleted file mode 100644 index f0d358a354..0000000000 --- a/data/layouts/MauvilleCity_BikeShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop_MapBorder:: - .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" - -MauvilleCity_BikeShop_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" - - .align 2 -MauvilleCity_BikeShop_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte MauvilleCity_BikeShop_MapBorder - .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 deleted file mode 100644 index 307f7205e7..0000000000 --- a/data/layouts/MauvilleCity_GameCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_GameCorner_MapBorder:: - .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" - -MauvilleCity_GameCorner_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" - - .align 2 -MauvilleCity_GameCorner_Layout:: - .4byte 0x16 - .4byte 0xb - .4byte MauvilleCity_GameCorner_MapBorder - .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 deleted file mode 100644 index 290fca78e0..0000000000 --- a/data/layouts/MauvilleCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Gym_MapBorder:: - .incbin "data/layouts/MauvilleCity_Gym/border.bin" - -MauvilleCity_Gym_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_Gym/map.bin" - - .align 2 -MauvilleCity_Gym_Layout:: - .4byte 0xa - .4byte 0x15 - .4byte MauvilleCity_Gym_MapBorder - .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 deleted file mode 100644 index ba7a0e487b..0000000000 --- a/data/layouts/MeteorFalls_1F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_1R_MapBorder:: - .incbin "data/layouts/MeteorFalls_1F_1R/border.bin" - -MeteorFalls_1F_1R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_1F_1R/map.bin" - - .align 2 -MeteorFalls_1F_1R_Layout:: - .4byte 0x1e - .4byte 0x2a - .4byte MeteorFalls_1F_1R_MapBorder - .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 deleted file mode 100644 index 2e3fcaf2e1..0000000000 --- a/data/layouts/MeteorFalls_1F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_2R_MapBorder:: - .incbin "data/layouts/MeteorFalls_1F_2R/border.bin" - -MeteorFalls_1F_2R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_1F_2R/map.bin" - - .align 2 -MeteorFalls_1F_2R_Layout:: - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_1F_2R_MapBorder - .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 deleted file mode 100644 index a4f385d8f4..0000000000 --- a/data/layouts/MeteorFalls_B1F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_1R_MapBorder:: - .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin" - -MeteorFalls_B1F_1R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin" - - .align 2 -MeteorFalls_B1F_1R_Layout:: - .4byte 0x1d - .4byte 0x26 - .4byte MeteorFalls_B1F_1R_MapBorder - .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 deleted file mode 100644 index 982edc975e..0000000000 --- a/data/layouts/MeteorFalls_B1F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_2R_MapBorder:: - .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin" - -MeteorFalls_B1F_2R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin" - - .align 2 -MeteorFalls_B1F_2R_Layout:: - .4byte 0xb - .4byte 0x12 - .4byte MeteorFalls_B1F_2R_MapBorder - .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 deleted file mode 100644 index 1baf70a097..0000000000 --- a/data/layouts/MeteorFalls_StevensCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_StevensCave_MapBorder:: - .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" - -MeteorFalls_StevensCave_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" - - .align 2 -MeteorFalls_StevensCave_Layout:: - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_StevensCave_MapBorder - .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 deleted file mode 100644 index be36cc758b..0000000000 --- a/data/layouts/MirageTower_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_1F_MapBorder:: - .incbin "data/layouts/MirageTower_1F/border.bin" - -MirageTower_1F_MapBlockdata:: - .incbin "data/layouts/MirageTower_1F/map.bin" - - .align 2 -MirageTower_1F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_1F_MapBorder - .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 deleted file mode 100644 index ec4971bc41..0000000000 --- a/data/layouts/MirageTower_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_2F_MapBorder:: - .incbin "data/layouts/MirageTower_2F/border.bin" - -MirageTower_2F_MapBlockdata:: - .incbin "data/layouts/MirageTower_2F/map.bin" - - .align 2 -MirageTower_2F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_2F_MapBorder - .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 deleted file mode 100644 index c12de3a150..0000000000 --- a/data/layouts/MirageTower_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_3F_MapBorder:: - .incbin "data/layouts/MirageTower_3F/border.bin" - -MirageTower_3F_MapBlockdata:: - .incbin "data/layouts/MirageTower_3F/map.bin" - - .align 2 -MirageTower_3F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_3F_MapBorder - .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 deleted file mode 100644 index 518f7c9435..0000000000 --- a/data/layouts/MirageTower_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_4F_MapBorder:: - .incbin "data/layouts/MirageTower_4F/border.bin" - -MirageTower_4F_MapBlockdata:: - .incbin "data/layouts/MirageTower_4F/map.bin" - - .align 2 -MirageTower_4F_Layout:: - .4byte 0xd - .4byte 0xa - .4byte MirageTower_4F_MapBorder - .4byte MirageTower_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc deleted file mode 100644 index 881cf9498d..0000000000 --- a/data/layouts/MossdeepCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_MapBorder:: - .incbin "data/layouts/MossdeepCity/border.bin" - -MossdeepCity_MapBlockdata:: - .incbin "data/layouts/MossdeepCity/map.bin" - - .align 2 -MossdeepCity_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte MossdeepCity_MapBorder - .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 deleted file mode 100644 index 2c2fb717da..0000000000 --- a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin" - -MossdeepCity_GameCorner_1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_1F_Layout:: - .4byte 0xc - .4byte 0xa - .4byte MossdeepCity_GameCorner_1F_MapBorder - .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 deleted file mode 100644 index ec5dd2a574..0000000000 --- a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_B1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin" - -MossdeepCity_GameCorner_B1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte MossdeepCity_GameCorner_B1F_MapBorder - .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 deleted file mode 100644 index a65212a40c..0000000000 --- a/data/layouts/MossdeepCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Gym_MapBorder:: - .incbin "data/layouts/MossdeepCity_Gym/border.bin" - -MossdeepCity_Gym_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_Gym/map.bin" - - .align 2 -MossdeepCity_Gym_Layout:: - .4byte 0x1a - .4byte 0x24 - .4byte MossdeepCity_Gym_MapBorder - .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 deleted file mode 100644 index 759e688912..0000000000 --- a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin" - -MossdeepCity_SpaceCenter_1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_Layout:: - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_1F_MapBorder - .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 deleted file mode 100644 index 6e370a7fac..0000000000 --- a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_2F_MapBorder:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin" - -MossdeepCity_SpaceCenter_2F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_Layout:: - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_2F_MapBorder - .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 deleted file mode 100644 index 0db92aee9f..0000000000 --- a/data/layouts/MossdeepCity_StevensHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_StevensHouse_MapBorder:: - .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" - -MossdeepCity_StevensHouse_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" - - .align 2 -MossdeepCity_StevensHouse_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_StevensHouse_MapBorder - .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc deleted file mode 100644 index 29a3b1ad7e..0000000000 --- a/data/layouts/MtChimney/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney_MapBorder:: - .incbin "data/layouts/MtChimney/border.bin" - -MtChimney_MapBlockdata:: - .incbin "data/layouts/MtChimney/map.bin" - - .align 2 -MtChimney_Layout:: - .4byte 0x28 - .4byte 0x2f - .4byte MtChimney_MapBorder - .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 deleted file mode 100644 index 2402e815c4..0000000000 --- a/data/layouts/MtPyre_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_1F_MapBorder:: - .incbin "data/layouts/MtPyre_1F/border.bin" - -MtPyre_1F_MapBlockdata:: - .incbin "data/layouts/MtPyre_1F/map.bin" - - .align 2 -MtPyre_1F_Layout:: - .4byte 0x16 - .4byte 0x13 - .4byte MtPyre_1F_MapBorder - .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 deleted file mode 100644 index 8d6ca12003..0000000000 --- a/data/layouts/MtPyre_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_2F_MapBorder:: - .incbin "data/layouts/MtPyre_2F/border.bin" - -MtPyre_2F_MapBlockdata:: - .incbin "data/layouts/MtPyre_2F/map.bin" - - .align 2 -MtPyre_2F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_2F_MapBorder - .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 deleted file mode 100644 index 24ed0f7b12..0000000000 --- a/data/layouts/MtPyre_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_3F_MapBorder:: - .incbin "data/layouts/MtPyre_3F/border.bin" - -MtPyre_3F_MapBlockdata:: - .incbin "data/layouts/MtPyre_3F/map.bin" - - .align 2 -MtPyre_3F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_3F_MapBorder - .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 deleted file mode 100644 index 65a8fcf598..0000000000 --- a/data/layouts/MtPyre_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F_MapBorder:: - .incbin "data/layouts/MtPyre_4F/border.bin" - -MtPyre_4F_MapBlockdata:: - .incbin "data/layouts/MtPyre_4F/map.bin" - - .align 2 -MtPyre_4F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_4F_MapBorder - .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 deleted file mode 100644 index 222c6eb804..0000000000 --- a/data/layouts/MtPyre_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_5F_MapBorder:: - .incbin "data/layouts/MtPyre_5F/border.bin" - -MtPyre_5F_MapBlockdata:: - .incbin "data/layouts/MtPyre_5F/map.bin" - - .align 2 -MtPyre_5F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_5F_MapBorder - .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 deleted file mode 100644 index 31b5288d5b..0000000000 --- a/data/layouts/MtPyre_6F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_6F_MapBorder:: - .incbin "data/layouts/MtPyre_6F/border.bin" - -MtPyre_6F_MapBlockdata:: - .incbin "data/layouts/MtPyre_6F/map.bin" - - .align 2 -MtPyre_6F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_6F_MapBorder - .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 deleted file mode 100644 index 1b5997dbae..0000000000 --- a/data/layouts/MtPyre_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Exterior_MapBorder:: - .incbin "data/layouts/MtPyre_Exterior/border.bin" - -MtPyre_Exterior_MapBlockdata:: - .incbin "data/layouts/MtPyre_Exterior/map.bin" - - .align 2 -MtPyre_Exterior_Layout:: - .4byte 0x26 - .4byte 0x33 - .4byte MtPyre_Exterior_MapBorder - .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 deleted file mode 100644 index 58e932eb7a..0000000000 --- a/data/layouts/MtPyre_Summit/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Summit_MapBorder:: - .incbin "data/layouts/MtPyre_Summit/border.bin" - -MtPyre_Summit_MapBlockdata:: - .incbin "data/layouts/MtPyre_Summit/map.bin" - - .align 2 -MtPyre_Summit_Layout:: - .4byte 0x32 - .4byte 0x25 - .4byte MtPyre_Summit_MapBorder - .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 deleted file mode 100644 index 6f15bd2766..0000000000 --- a/data/layouts/NavelRock_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_B1F_MapBorder:: - .incbin "data/layouts/NavelRock_B1F/border.bin" - -NavelRock_B1F_MapBlockdata:: - .incbin "data/layouts/NavelRock_B1F/map.bin" - - .align 2 -NavelRock_B1F_Layout:: - .4byte 0x17 - .4byte 0xb - .4byte NavelRock_B1F_MapBorder - .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 deleted file mode 100644 index 5c96a8cef2..0000000000 --- a/data/layouts/NavelRock_Bottom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Bottom_MapBorder:: - .incbin "data/layouts/NavelRock_Bottom/border.bin" - -NavelRock_Bottom_MapBlockdata:: - .incbin "data/layouts/NavelRock_Bottom/map.bin" - - .align 2 -NavelRock_Bottom_Layout:: - .4byte 0x16 - .4byte 0x16 - .4byte NavelRock_Bottom_MapBorder - .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 deleted file mode 100644 index 6dcedcb208..0000000000 --- a/data/layouts/NavelRock_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Entrance_MapBorder:: - .incbin "data/layouts/NavelRock_Entrance/border.bin" - -NavelRock_Entrance_MapBlockdata:: - .incbin "data/layouts/NavelRock_Entrance/map.bin" - - .align 2 -NavelRock_Entrance_Layout:: - .4byte 0x15 - .4byte 0x20 - .4byte NavelRock_Entrance_MapBorder - .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 deleted file mode 100644 index c2c4fa95e5..0000000000 --- a/data/layouts/NavelRock_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Exterior_MapBorder:: - .incbin "data/layouts/NavelRock_Exterior/border.bin" - -NavelRock_Exterior_MapBlockdata:: - .incbin "data/layouts/NavelRock_Exterior/map.bin" - - .align 2 -NavelRock_Exterior_Layout:: - .4byte 0x15 - .4byte 0x18 - .4byte NavelRock_Exterior_MapBorder - .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 deleted file mode 100644 index ab5d9c8673..0000000000 --- a/data/layouts/NavelRock_Fork/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Fork_MapBorder:: - .incbin "data/layouts/NavelRock_Fork/border.bin" - -NavelRock_Fork_MapBlockdata:: - .incbin "data/layouts/NavelRock_Fork/map.bin" - - .align 2 -NavelRock_Fork_Layout:: - .4byte 0x1b - .4byte 0x56 - .4byte NavelRock_Fork_MapBorder - .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 deleted file mode 100644 index a7fc73d220..0000000000 --- a/data/layouts/NavelRock_LadderRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_LadderRoom1_MapBorder:: - .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" - -NavelRock_LadderRoom1_MapBlockdata:: - .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" - - .align 2 -NavelRock_LadderRoom1_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_LadderRoom1_MapBorder - .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 deleted file mode 100644 index 8fbd6e51ff..0000000000 --- a/data/layouts/NavelRock_LadderRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_LadderRoom2_MapBorder:: - .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" - -NavelRock_LadderRoom2_MapBlockdata:: - .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" - - .align 2 -NavelRock_LadderRoom2_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_LadderRoom2_MapBorder - .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 deleted file mode 100644 index 50698cc768..0000000000 --- a/data/layouts/NavelRock_Top/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top_MapBorder:: - .incbin "data/layouts/NavelRock_Top/border.bin" - -NavelRock_Top_MapBlockdata:: - .incbin "data/layouts/NavelRock_Top/map.bin" - - .align 2 -NavelRock_Top_Layout:: - .4byte 0x19 - .4byte 0x1c - .4byte NavelRock_Top_MapBorder - .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 deleted file mode 100644 index bbd81cac7d..0000000000 --- a/data/layouts/NewMauville_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Entrance_MapBorder:: - .incbin "data/layouts/NewMauville_Entrance/border.bin" - -NewMauville_Entrance_MapBlockdata:: - .incbin "data/layouts/NewMauville_Entrance/map.bin" - - .align 2 -NewMauville_Entrance_Layout:: - .4byte 0x9 - .4byte 0x9 - .4byte NewMauville_Entrance_MapBorder - .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 deleted file mode 100644 index 096142c6de..0000000000 --- a/data/layouts/NewMauville_Inside/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Inside_MapBorder:: - .incbin "data/layouts/NewMauville_Inside/border.bin" - -NewMauville_Inside_MapBlockdata:: - .incbin "data/layouts/NewMauville_Inside/map.bin" - - .align 2 -NewMauville_Inside_Layout:: - .4byte 0x29 - .4byte 0x29 - .4byte NewMauville_Inside_MapBorder - .4byte NewMauville_Inside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc deleted file mode 100644 index 9709ca1ea0..0000000000 --- a/data/layouts/OldaleTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_MapBorder:: - .incbin "data/layouts/OldaleTown/border.bin" - -OldaleTown_MapBlockdata:: - .incbin "data/layouts/OldaleTown/map.bin" - - .align 2 -OldaleTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte OldaleTown_MapBorder - .4byte OldaleTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc deleted file mode 100644 index 4ba791f231..0000000000 --- a/data/layouts/PacifidlogTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_MapBorder:: - .incbin "data/layouts/PacifidlogTown/border.bin" - -PacifidlogTown_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown/map.bin" - - .align 2 -PacifidlogTown_Layout:: - .4byte 0x14 - .4byte 0x28 - .4byte PacifidlogTown_MapBorder - .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 deleted file mode 100644 index b5dcf58b23..0000000000 --- a/data/layouts/PacifidlogTown_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House1_MapBorder:: - .incbin "data/layouts/PacifidlogTown_House1/border.bin" - -PacifidlogTown_House1_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown_House1/map.bin" - - .align 2 -PacifidlogTown_House1_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House1_MapBorder - .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 deleted file mode 100644 index a10daa3cd6..0000000000 --- a/data/layouts/PacifidlogTown_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House2_MapBorder:: - .incbin "data/layouts/PacifidlogTown_House2/border.bin" - -PacifidlogTown_House2_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown_House2/map.bin" - - .align 2 -PacifidlogTown_House2_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House2_MapBorder - .4byte PacifidlogTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc deleted file mode 100644 index bae16b88f3..0000000000 --- a/data/layouts/PetalburgCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_MapBorder:: - .incbin "data/layouts/PetalburgCity/border.bin" - -PetalburgCity_MapBlockdata:: - .incbin "data/layouts/PetalburgCity/map.bin" - - .align 2 -PetalburgCity_Layout:: - .4byte 0x1e - .4byte 0x1e - .4byte PetalburgCity_MapBorder - .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 deleted file mode 100644 index 36fe1002ff..0000000000 --- a/data/layouts/PetalburgCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Gym_MapBorder:: - .incbin "data/layouts/PetalburgCity_Gym/border.bin" - -PetalburgCity_Gym_MapBlockdata:: - .incbin "data/layouts/PetalburgCity_Gym/map.bin" - - .align 2 -PetalburgCity_Gym_Layout:: - .4byte 0x9 - .4byte 0x70 - .4byte PetalburgCity_Gym_MapBorder - .4byte PetalburgCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PetalburgGym - diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc deleted file mode 100644 index 840e17f7e8..0000000000 --- a/data/layouts/PetalburgWoods/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgWoods_MapBorder:: - .incbin "data/layouts/PetalburgWoods/border.bin" - -PetalburgWoods_MapBlockdata:: - .incbin "data/layouts/PetalburgWoods/map.bin" - - .align 2 -PetalburgWoods_Layout:: - .4byte 0x30 - .4byte 0x2c - .4byte PetalburgWoods_MapBorder - .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 deleted file mode 100644 index bf1335f844..0000000000 --- a/data/layouts/PokemonCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonCenter_1F_MapBorder:: - .incbin "data/layouts/PokemonCenter_1F/border.bin" - -PokemonCenter_1F_MapBlockdata:: - .incbin "data/layouts/PokemonCenter_1F/map.bin" - - .align 2 -PokemonCenter_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte PokemonCenter_1F_MapBorder - .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 deleted file mode 100644 index 3cb812de77..0000000000 --- a/data/layouts/PokemonCenter_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonCenter_2F_MapBorder:: - .incbin "data/layouts/PokemonCenter_2F/border.bin" - -PokemonCenter_2F_MapBlockdata:: - .incbin "data/layouts/PokemonCenter_2F/map.bin" - - .align 2 -PokemonCenter_2F_Layout:: - .4byte 0xe - .4byte 0xa - .4byte PokemonCenter_2F_MapBorder - .4byte PokemonCenter_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc deleted file mode 100644 index ed258b2a7f..0000000000 --- a/data/layouts/RecordCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RecordCorner_MapBorder:: - .incbin "data/layouts/RecordCorner/border.bin" - -RecordCorner_MapBlockdata:: - .incbin "data/layouts/RecordCorner/map.bin" - - .align 2 -RecordCorner_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte RecordCorner_MapBorder - .4byte RecordCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc deleted file mode 100644 index e42ecf340e..0000000000 --- a/data/layouts/Route101/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route101_MapBorder:: - .incbin "data/layouts/Route101/border.bin" - -Route101_MapBlockdata:: - .incbin "data/layouts/Route101/map.bin" - - .align 2 -Route101_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte Route101_MapBorder - .4byte Route101_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc deleted file mode 100644 index 194d44fce7..0000000000 --- a/data/layouts/Route102/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route102_MapBorder:: - .incbin "data/layouts/Route102/border.bin" - -Route102_MapBlockdata:: - .incbin "data/layouts/Route102/map.bin" - - .align 2 -Route102_Layout:: - .4byte 0x32 - .4byte 0x14 - .4byte Route102_MapBorder - .4byte Route102_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc deleted file mode 100644 index fe3bac0668..0000000000 --- a/data/layouts/Route103/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route103_MapBorder:: - .incbin "data/layouts/Route103/border.bin" - -Route103_MapBlockdata:: - .incbin "data/layouts/Route103/map.bin" - - .align 2 -Route103_Layout:: - .4byte 0x50 - .4byte 0x16 - .4byte Route103_MapBorder - .4byte Route103_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc deleted file mode 100644 index 9a9418e461..0000000000 --- a/data/layouts/Route104/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MapBorder:: - .incbin "data/layouts/Route104/border.bin" - -Route104_MapBlockdata:: - .incbin "data/layouts/Route104/map.bin" - - .align 2 -Route104_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route104_MapBorder - .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 deleted file mode 100644 index 3474f33351..0000000000 --- a/data/layouts/Route104_MrBrineysHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MrBrineysHouse_MapBorder:: - .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" - -Route104_MrBrineysHouse_MapBlockdata:: - .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" - - .align 2 -Route104_MrBrineysHouse_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte Route104_MrBrineysHouse_MapBorder - .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 deleted file mode 100644 index a46ffc18c8..0000000000 --- a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrettyPetalFlowerShop_MapBorder:: - .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" - -Route104_PrettyPetalFlowerShop_MapBlockdata:: - .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_Layout:: - .4byte 0xf - .4byte 0x9 - .4byte Route104_PrettyPetalFlowerShop_MapBorder - .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 deleted file mode 100644 index b2b2c4f194..0000000000 --- a/data/layouts/Route104_Prototype/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_Prototype_MapBorder:: - .incbin "data/layouts/Route104_Prototype/border.bin" - -Route104_Prototype_MapBlockdata:: - .incbin "data/layouts/Route104_Prototype/map.bin" - - .align 2 -Route104_Prototype_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte Route104_Prototype_MapBorder - .4byte Route104_Prototype_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc deleted file mode 100644 index ce78ef9cc2..0000000000 --- a/data/layouts/Route105/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route105_MapBorder:: - .incbin "data/layouts/Route105/border.bin" - -Route105_MapBlockdata:: - .incbin "data/layouts/Route105/map.bin" - - .align 2 -Route105_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route105_MapBorder - .4byte Route105_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc deleted file mode 100644 index ea255b383b..0000000000 --- a/data/layouts/Route106/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route106_MapBorder:: - .incbin "data/layouts/Route106/border.bin" - -Route106_MapBlockdata:: - .incbin "data/layouts/Route106/map.bin" - - .align 2 -Route106_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route106_MapBorder - .4byte Route106_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc deleted file mode 100644 index ea305b2a76..0000000000 --- a/data/layouts/Route107/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route107_MapBorder:: - .incbin "data/layouts/Route107/border.bin" - -Route107_MapBlockdata:: - .incbin "data/layouts/Route107/map.bin" - - .align 2 -Route107_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route107_MapBorder - .4byte Route107_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc deleted file mode 100644 index 1ec7171cf0..0000000000 --- a/data/layouts/Route108/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route108_MapBorder:: - .incbin "data/layouts/Route108/border.bin" - -Route108_MapBlockdata:: - .incbin "data/layouts/Route108/map.bin" - - .align 2 -Route108_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route108_MapBorder - .4byte Route108_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc deleted file mode 100644 index fa41585e93..0000000000 --- a/data/layouts/Route109/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_MapBorder:: - .incbin "data/layouts/Route109/border.bin" - -Route109_MapBlockdata:: - .incbin "data/layouts/Route109/map.bin" - - .align 2 -Route109_Layout:: - .4byte 0x28 - .4byte 0x3f - .4byte Route109_MapBorder - .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 deleted file mode 100644 index 9ec997b484..0000000000 --- a/data/layouts/Route109_SeashoreHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_SeashoreHouse_MapBorder:: - .incbin "data/layouts/Route109_SeashoreHouse/border.bin" - -Route109_SeashoreHouse_MapBlockdata:: - .incbin "data/layouts/Route109_SeashoreHouse/map.bin" - - .align 2 -Route109_SeashoreHouse_Layout:: - .4byte 0xf - .4byte 0xa - .4byte Route109_SeashoreHouse_MapBorder - .4byte Route109_SeashoreHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SeashoreHouse - diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc deleted file mode 100644 index 24e5a93210..0000000000 --- a/data/layouts/Route110/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_MapBorder:: - .incbin "data/layouts/Route110/border.bin" - -Route110_MapBlockdata:: - .incbin "data/layouts/Route110/map.bin" - - .align 2 -Route110_Layout:: - .4byte 0x28 - .4byte 0x64 - .4byte Route110_MapBorder - .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 deleted file mode 100644 index abf78f62dd..0000000000 --- a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadEntrance_MapBorder:: - .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" - -Route110_SeasideCyclingRoadEntrance_MapBlockdata:: - .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" - - .align 2 -Route110_SeasideCyclingRoadEntrance_Layout:: - .4byte 0xf - .4byte 0x6 - .4byte Route110_SeasideCyclingRoadEntrance_MapBorder - .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 deleted file mode 100644 index fe6ee4d26b..0000000000 --- a/data/layouts/Route110_TrickHouseCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseCorridor_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" - -Route110_TrickHouseCorridor_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" - - .align 2 -Route110_TrickHouseCorridor_Layout:: - .4byte 0xf - .4byte 0x18 - .4byte Route110_TrickHouseCorridor_MapBorder - .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 deleted file mode 100644 index dd9474aeef..0000000000 --- a/data/layouts/Route110_TrickHouseEnd/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEnd_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" - -Route110_TrickHouseEnd_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" - - .align 2 -Route110_TrickHouseEnd_Layout:: - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEnd_MapBorder - .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 deleted file mode 100644 index 97f3abe24c..0000000000 --- a/data/layouts/Route110_TrickHouseEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEntrance_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" - -Route110_TrickHouseEntrance_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" - - .align 2 -Route110_TrickHouseEntrance_Layout:: - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEntrance_MapBorder - .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 deleted file mode 100644 index 546876ab00..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle1_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" - -Route110_TrickHousePuzzle1_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" - - .align 2 -Route110_TrickHousePuzzle1_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle1_MapBorder - .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 deleted file mode 100644 index 65caaa7341..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle2_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" - -Route110_TrickHousePuzzle2_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" - - .align 2 -Route110_TrickHousePuzzle2_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle2_MapBorder - .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 deleted file mode 100644 index a03cf9a719..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle3_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" - -Route110_TrickHousePuzzle3_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" - - .align 2 -Route110_TrickHousePuzzle3_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle3_MapBorder - .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 deleted file mode 100644 index 581b41a43b..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle4_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" - -Route110_TrickHousePuzzle4_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" - - .align 2 -Route110_TrickHousePuzzle4_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle4_MapBorder - .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 deleted file mode 100644 index 5e06ac31e4..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle5_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" - -Route110_TrickHousePuzzle5_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" - - .align 2 -Route110_TrickHousePuzzle5_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle5_MapBorder - .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 deleted file mode 100644 index 398c179516..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle6_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" - -Route110_TrickHousePuzzle6_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" - - .align 2 -Route110_TrickHousePuzzle6_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle6_MapBorder - .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 deleted file mode 100644 index 1612ec41b5..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle7_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" - -Route110_TrickHousePuzzle7_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" - - .align 2 -Route110_TrickHousePuzzle7_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle7_MapBorder - .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 deleted file mode 100644 index 3520b503f7..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle8_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" - -Route110_TrickHousePuzzle8_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" - - .align 2 -Route110_TrickHousePuzzle8_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle8_MapBorder - .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc deleted file mode 100644 index 2966c06c54..0000000000 --- a/data/layouts/Route111/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_MapBorder:: - .incbin "data/layouts/Route111/border.bin" - -Route111_MapBlockdata:: - .incbin "data/layouts/Route111/map.bin" - - .align 2 -Route111_Layout:: - .4byte 0x28 - .4byte 0x8c - .4byte Route111_MapBorder - .4byte Route111_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc deleted file mode 100644 index bf6a188ccf..0000000000 --- a/data/layouts/Route111_NoMirageTower/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_NoMirageTower_MapBorder:: - .incbin "data/layouts/Route111_NoMirageTower/border.bin" - -Route111_NoMirageTower_MapBlockdata:: - .incbin "data/layouts/Route111_NoMirageTower/map.bin" - - .align 2 -Route111_NoMirageTower_Layout:: - .4byte 0x28 - .4byte 0x8C - .4byte Route111_NoMirageTower_MapBorder - .4byte Route111_NoMirageTower_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc deleted file mode 100644 index 72a0c428c4..0000000000 --- a/data/layouts/Route112/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112_MapBorder:: - .incbin "data/layouts/Route112/border.bin" - -Route112_MapBlockdata:: - .incbin "data/layouts/Route112/map.bin" - - .align 2 -Route112_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte Route112_MapBorder - .4byte Route112_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc deleted file mode 100644 index 0c1d76b585..0000000000 --- a/data/layouts/Route113/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113_MapBorder:: - .incbin "data/layouts/Route113/border.bin" - -Route113_MapBlockdata:: - .incbin "data/layouts/Route113/map.bin" - - .align 2 -Route113_Layout:: - .4byte 0x64 - .4byte 0x14 - .4byte Route113_MapBorder - .4byte Route113_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc deleted file mode 100644 index 071f9e1b66..0000000000 --- a/data/layouts/Route114/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_MapBorder:: - .incbin "data/layouts/Route114/border.bin" - -Route114_MapBlockdata:: - .incbin "data/layouts/Route114/map.bin" - - .align 2 -Route114_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route114_MapBorder - .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 deleted file mode 100644 index f915e572a9..0000000000 --- a/data/layouts/Route114_FossilManiacsHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsHouse_MapBorder:: - .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" - -Route114_FossilManiacsHouse_MapBlockdata:: - .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" - - .align 2 -Route114_FossilManiacsHouse_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte Route114_FossilManiacsHouse_MapBorder - .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 deleted file mode 100644 index c2392ff01c..0000000000 --- a/data/layouts/Route114_FossilManiacsTunnel/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel_MapBorder:: - .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" - -Route114_FossilManiacsTunnel_MapBlockdata:: - .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" - - .align 2 -Route114_FossilManiacsTunnel_Layout:: - .4byte 0xd - .4byte 0x1a - .4byte Route114_FossilManiacsTunnel_MapBorder - .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 deleted file mode 100644 index be9689ae30..0000000000 --- a/data/layouts/Route114_LanettesHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse_MapBorder:: - .incbin "data/layouts/Route114_LanettesHouse/border.bin" - -Route114_LanettesHouse_MapBlockdata:: - .incbin "data/layouts/Route114_LanettesHouse/map.bin" - - .align 2 -Route114_LanettesHouse_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte Route114_LanettesHouse_MapBorder - .4byte Route114_LanettesHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc deleted file mode 100644 index 9d6c3c969b..0000000000 --- a/data/layouts/Route115/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route115_MapBorder:: - .incbin "data/layouts/Route115/border.bin" - -Route115_MapBlockdata:: - .incbin "data/layouts/Route115/map.bin" - - .align 2 -Route115_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route115_MapBorder - .4byte Route115_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc deleted file mode 100644 index 232cc41f8a..0000000000 --- a/data/layouts/Route116/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_MapBorder:: - .incbin "data/layouts/Route116/border.bin" - -Route116_MapBlockdata:: - .incbin "data/layouts/Route116/map.bin" - - .align 2 -Route116_Layout:: - .4byte 0x64 - .4byte 0x14 - .4byte Route116_MapBorder - .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 deleted file mode 100644 index 1bd42eafca..0000000000 --- a/data/layouts/Route116_TunnelersRestHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_TunnelersRestHouse_MapBorder:: - .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" - -Route116_TunnelersRestHouse_MapBlockdata:: - .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" - - .align 2 -Route116_TunnelersRestHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte Route116_TunnelersRestHouse_MapBorder - .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc deleted file mode 100644 index 25e133f28e..0000000000 --- a/data/layouts/Route117/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_MapBorder:: - .incbin "data/layouts/Route117/border.bin" - -Route117_MapBlockdata:: - .incbin "data/layouts/Route117/map.bin" - - .align 2 -Route117_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route117_MapBorder - .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 deleted file mode 100644 index 403881bfea..0000000000 --- a/data/layouts/Route117_PokemonDayCare/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_PokemonDayCare_MapBorder:: - .incbin "data/layouts/Route117_PokemonDayCare/border.bin" - -Route117_PokemonDayCare_MapBlockdata:: - .incbin "data/layouts/Route117_PokemonDayCare/map.bin" - - .align 2 -Route117_PokemonDayCare_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte Route117_PokemonDayCare_MapBorder - .4byte Route117_PokemonDayCare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonDayCare - diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc deleted file mode 100644 index cb87f8414e..0000000000 --- a/data/layouts/Route118/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route118_MapBorder:: - .incbin "data/layouts/Route118/border.bin" - -Route118_MapBlockdata:: - .incbin "data/layouts/Route118/map.bin" - - .align 2 -Route118_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route118_MapBorder - .4byte Route118_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc deleted file mode 100644 index 66502fb15f..0000000000 --- a/data/layouts/Route119/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_MapBorder:: - .incbin "data/layouts/Route119/border.bin" - -Route119_MapBlockdata:: - .incbin "data/layouts/Route119/map.bin" - - .align 2 -Route119_Layout:: - .4byte 0x28 - .4byte 0x8c - .4byte Route119_MapBorder - .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 deleted file mode 100644 index 9637beea5c..0000000000 --- a/data/layouts/Route119_WeatherInstitute_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_1F_MapBorder:: - .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin" - -Route119_WeatherInstitute_1F_MapBlockdata:: - .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin" - - .align 2 -Route119_WeatherInstitute_1F_Layout:: - .4byte 0x14 - .4byte 0xd - .4byte Route119_WeatherInstitute_1F_MapBorder - .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 deleted file mode 100644 index 4f0948f7be..0000000000 --- a/data/layouts/Route119_WeatherInstitute_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_2F_MapBorder:: - .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin" - -Route119_WeatherInstitute_2F_MapBlockdata:: - .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin" - - .align 2 -Route119_WeatherInstitute_2F_Layout:: - .4byte 0x14 - .4byte 0xb - .4byte Route119_WeatherInstitute_2F_MapBorder - .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 deleted file mode 100644 index f9e9255a0f..0000000000 --- a/data/layouts/Route120/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route120_MapBorder:: - .incbin "data/layouts/Route120/border.bin" - -Route120_MapBlockdata:: - .incbin "data/layouts/Route120/map.bin" - - .align 2 -Route120_Layout:: - .4byte 0x28 - .4byte 0x64 - .4byte Route120_MapBorder - .4byte Route120_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc deleted file mode 100644 index 4d2c9744a4..0000000000 --- a/data/layouts/Route121/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_MapBorder:: - .incbin "data/layouts/Route121/border.bin" - -Route121_MapBlockdata:: - .incbin "data/layouts/Route121/map.bin" - - .align 2 -Route121_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route121_MapBorder - .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 deleted file mode 100644 index 38ad9e97ed..0000000000 --- a/data/layouts/Route121_SafariZoneEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_SafariZoneEntrance_MapBorder:: - .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" - -Route121_SafariZoneEntrance_MapBlockdata:: - .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" - - .align 2 -Route121_SafariZoneEntrance_Layout:: - .4byte 0x12 - .4byte 0xe - .4byte Route121_SafariZoneEntrance_MapBorder - .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc deleted file mode 100644 index 7f0baac20e..0000000000 --- a/data/layouts/Route122/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route122_MapBorder:: - .incbin "data/layouts/Route122/border.bin" - -Route122_MapBlockdata:: - .incbin "data/layouts/Route122/map.bin" - - .align 2 -Route122_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte Route122_MapBorder - .4byte Route122_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc deleted file mode 100644 index 0c76c2b7b6..0000000000 --- a/data/layouts/Route123/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123_MapBorder:: - .incbin "data/layouts/Route123/border.bin" - -Route123_MapBlockdata:: - .incbin "data/layouts/Route123/map.bin" - - .align 2 -Route123_Layout:: - .4byte 0x8c - .4byte 0x14 - .4byte Route123_MapBorder - .4byte Route123_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc deleted file mode 100644 index d27ed902a5..0000000000 --- a/data/layouts/Route124/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_MapBorder:: - .incbin "data/layouts/Route124/border.bin" - -Route124_MapBlockdata:: - .incbin "data/layouts/Route124/map.bin" - - .align 2 -Route124_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route124_MapBorder - .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 deleted file mode 100644 index 2635712359..0000000000 --- a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_DivingTreasureHuntersHouse_MapBorder:: - .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" - -Route124_DivingTreasureHuntersHouse_MapBlockdata:: - .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte Route124_DivingTreasureHuntersHouse_MapBorder - .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc deleted file mode 100644 index f0d4e13b73..0000000000 --- a/data/layouts/Route125/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route125_MapBorder:: - .incbin "data/layouts/Route125/border.bin" - -Route125_MapBlockdata:: - .incbin "data/layouts/Route125/map.bin" - - .align 2 -Route125_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route125_MapBorder - .4byte Route125_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc deleted file mode 100644 index 859d025a5d..0000000000 --- a/data/layouts/Route126/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route126_MapBorder:: - .incbin "data/layouts/Route126/border.bin" - -Route126_MapBlockdata:: - .incbin "data/layouts/Route126/map.bin" - - .align 2 -Route126_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route126_MapBorder - .4byte Route126_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc deleted file mode 100644 index 767330aff8..0000000000 --- a/data/layouts/Route127/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route127_MapBorder:: - .incbin "data/layouts/Route127/border.bin" - -Route127_MapBlockdata:: - .incbin "data/layouts/Route127/map.bin" - - .align 2 -Route127_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route127_MapBorder - .4byte Route127_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc deleted file mode 100644 index 16624fa023..0000000000 --- a/data/layouts/Route128/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route128_MapBorder:: - .incbin "data/layouts/Route128/border.bin" - -Route128_MapBlockdata:: - .incbin "data/layouts/Route128/map.bin" - - .align 2 -Route128_Layout:: - .4byte 0x78 - .4byte 0x28 - .4byte Route128_MapBorder - .4byte Route128_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc deleted file mode 100644 index 9b7d6af1de..0000000000 --- a/data/layouts/Route129/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route129_MapBorder:: - .incbin "data/layouts/Route129/border.bin" - -Route129_MapBlockdata:: - .incbin "data/layouts/Route129/map.bin" - - .align 2 -Route129_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route129_MapBorder - .4byte Route129_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc deleted file mode 100644 index 41db11cb41..0000000000 --- a/data/layouts/Route130/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route130_MapBorder:: - .incbin "data/layouts/Route130/border.bin" - -Route130_MapBlockdata:: - .incbin "data/layouts/Route130/map.bin" - - .align 2 -Route130_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route130_MapBorder - .4byte Route130_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc deleted file mode 100644 index 7fae261cc8..0000000000 --- a/data/layouts/Route131/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route131_MapBorder:: - .incbin "data/layouts/Route131/border.bin" - -Route131_MapBlockdata:: - .incbin "data/layouts/Route131/map.bin" - - .align 2 -Route131_Layout:: - .4byte 0x3c - .4byte 0x28 - .4byte Route131_MapBorder - .4byte Route131_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc deleted file mode 100644 index afaa7fb58b..0000000000 --- a/data/layouts/Route132/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132_MapBorder:: - .incbin "data/layouts/Route132/border.bin" - -Route132_MapBlockdata:: - .incbin "data/layouts/Route132/map.bin" - - .align 2 -Route132_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route132_MapBorder - .4byte Route132_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc deleted file mode 100644 index 5ff11108b9..0000000000 --- a/data/layouts/Route133/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133_MapBorder:: - .incbin "data/layouts/Route133/border.bin" - -Route133_MapBlockdata:: - .incbin "data/layouts/Route133/map.bin" - - .align 2 -Route133_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route133_MapBorder - .4byte Route133_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc deleted file mode 100644 index 9eeca6cc9a..0000000000 --- a/data/layouts/Route134/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route134_MapBorder:: - .incbin "data/layouts/Route134/border.bin" - -Route134_MapBlockdata:: - .incbin "data/layouts/Route134/map.bin" - - .align 2 -Route134_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route134_MapBorder - .4byte Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc deleted file mode 100644 index 00c45dcc25..0000000000 --- a/data/layouts/RustboroCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_MapBorder:: - .incbin "data/layouts/RustboroCity/border.bin" - -RustboroCity_MapBlockdata:: - .incbin "data/layouts/RustboroCity/map.bin" - - .align 2 -RustboroCity_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte RustboroCity_MapBorder - .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 deleted file mode 100644 index 0c86dede9a..0000000000 --- a/data/layouts/RustboroCity_CuttersHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_CuttersHouse_MapBorder:: - .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" - -RustboroCity_CuttersHouse_MapBlockdata:: - .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" - - .align 2 -RustboroCity_CuttersHouse_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte RustboroCity_CuttersHouse_MapBorder - .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 deleted file mode 100644 index dbf6b388e1..0000000000 --- a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin" - -RustboroCity_DevonCorp_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin" - - .align 2 -RustboroCity_DevonCorp_1F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_1F_MapBorder - .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 deleted file mode 100644 index 34d581ae54..0000000000 --- a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin" - -RustboroCity_DevonCorp_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin" - - .align 2 -RustboroCity_DevonCorp_2F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_2F_MapBorder - .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 deleted file mode 100644 index 64c555be55..0000000000 --- a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin" - -RustboroCity_DevonCorp_3F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin" - - .align 2 -RustboroCity_DevonCorp_3F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_3F_MapBorder - .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 deleted file mode 100644 index b904524a6f..0000000000 --- a/data/layouts/RustboroCity_Flat1_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin" - -RustboroCity_Flat1_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin" - - .align 2 -RustboroCity_Flat1_1F_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_1F_MapBorder - .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 deleted file mode 100644 index aa6e3ebdf9..0000000000 --- a/data/layouts/RustboroCity_Flat1_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin" - -RustboroCity_Flat1_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin" - - .align 2 -RustboroCity_Flat1_2F_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_2F_MapBorder - .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 deleted file mode 100644 index 8e44c97b70..0000000000 --- a/data/layouts/RustboroCity_Flat2_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin" - -RustboroCity_Flat2_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin" - - .align 2 -RustboroCity_Flat2_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_1F_MapBorder - .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 deleted file mode 100644 index ffcba8d17e..0000000000 --- a/data/layouts/RustboroCity_Flat2_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin" - -RustboroCity_Flat2_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin" - - .align 2 -RustboroCity_Flat2_2F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_2F_MapBorder - .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 deleted file mode 100644 index 77775b4e02..0000000000 --- a/data/layouts/RustboroCity_Flat2_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_3F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin" - -RustboroCity_Flat2_3F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin" - - .align 2 -RustboroCity_Flat2_3F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_3F_MapBorder - .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 deleted file mode 100644 index 8c064171bf..0000000000 --- a/data/layouts/RustboroCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Gym_MapBorder:: - .incbin "data/layouts/RustboroCity_Gym/border.bin" - -RustboroCity_Gym_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Gym/map.bin" - - .align 2 -RustboroCity_Gym_Layout:: - .4byte 0xb - .4byte 0x14 - .4byte RustboroCity_Gym_MapBorder - .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 deleted file mode 100644 index 0c8a2075e5..0000000000 --- a/data/layouts/RustboroCity_House/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House_MapBorder:: - .incbin "data/layouts/RustboroCity_House/border.bin" - -RustboroCity_House_MapBlockdata:: - .incbin "data/layouts/RustboroCity_House/map.bin" - - .align 2 -RustboroCity_House_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte RustboroCity_House_MapBorder - .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 deleted file mode 100644 index 27893f2fb0..0000000000 --- a/data/layouts/RustboroCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House1_MapBorder:: - .incbin "data/layouts/RustboroCity_House1/border.bin" - -RustboroCity_House1_MapBlockdata:: - .incbin "data/layouts/RustboroCity_House1/map.bin" - - .align 2 -RustboroCity_House1_Layout:: - .4byte 0xd - .4byte 0x8 - .4byte RustboroCity_House1_MapBorder - .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 deleted file mode 100644 index 2c4eb3977c..0000000000 --- a/data/layouts/RustboroCity_PokemonSchool/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonSchool_MapBorder:: - .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" - -RustboroCity_PokemonSchool_MapBlockdata:: - .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" - - .align 2 -RustboroCity_PokemonSchool_Layout:: - .4byte 0xc - .4byte 0xb - .4byte RustboroCity_PokemonSchool_MapBorder - .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonSchool - diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc deleted file mode 100644 index 7a063b922c..0000000000 --- a/data/layouts/RusturfTunnel/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RusturfTunnel_MapBorder:: - .incbin "data/layouts/RusturfTunnel/border.bin" - -RusturfTunnel_MapBlockdata:: - .incbin "data/layouts/RusturfTunnel/map.bin" - - .align 2 -RusturfTunnel_Layout:: - .4byte 0x24 - .4byte 0x18 - .4byte RusturfTunnel_MapBorder - .4byte RusturfTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_RusturfTunnel - diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc deleted file mode 100644 index bcc034ecd9..0000000000 --- a/data/layouts/SSTidalCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalCorridor_MapBorder:: - .incbin "data/layouts/SSTidalCorridor/border.bin" - -SSTidalCorridor_MapBlockdata:: - .incbin "data/layouts/SSTidalCorridor/map.bin" - - .align 2 -SSTidalCorridor_Layout:: - .4byte 0x12 - .4byte 0xd - .4byte SSTidalCorridor_MapBorder - .4byte SSTidalCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc deleted file mode 100644 index 807da09a18..0000000000 --- a/data/layouts/SSTidalLowerDeck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalLowerDeck_MapBorder:: - .incbin "data/layouts/SSTidalLowerDeck/border.bin" - -SSTidalLowerDeck_MapBlockdata:: - .incbin "data/layouts/SSTidalLowerDeck/map.bin" - - .align 2 -SSTidalLowerDeck_Layout:: - .4byte 0x11 - .4byte 0xd - .4byte SSTidalLowerDeck_MapBorder - .4byte SSTidalLowerDeck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc deleted file mode 100644 index e44aac53c9..0000000000 --- a/data/layouts/SSTidalRooms/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalRooms_MapBorder:: - .incbin "data/layouts/SSTidalRooms/border.bin" - -SSTidalRooms_MapBlockdata:: - .incbin "data/layouts/SSTidalRooms/map.bin" - - .align 2 -SSTidalRooms_Layout:: - .4byte 0x24 - .4byte 0x12 - .4byte SSTidalRooms_MapBorder - .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 deleted file mode 100644 index c6986540fe..0000000000 --- a/data/layouts/SafariZone_North/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_North_MapBorder:: - .incbin "data/layouts/SafariZone_North/border.bin" - -SafariZone_North_MapBlockdata:: - .incbin "data/layouts/SafariZone_North/map.bin" - - .align 2 -SafariZone_North_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_North_MapBorder - .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 deleted file mode 100644 index 026e4a7c76..0000000000 --- a/data/layouts/SafariZone_Northeast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northeast_MapBorder:: - .incbin "data/layouts/SafariZone_Northeast/border.bin" - -SafariZone_Northeast_MapBlockdata:: - .incbin "data/layouts/SafariZone_Northeast/map.bin" - - .align 2 -SafariZone_Northeast_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northeast_MapBorder - .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 deleted file mode 100644 index 09d8bd4829..0000000000 --- a/data/layouts/SafariZone_Northwest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northwest_MapBorder:: - .incbin "data/layouts/SafariZone_Northwest/border.bin" - -SafariZone_Northwest_MapBlockdata:: - .incbin "data/layouts/SafariZone_Northwest/map.bin" - - .align 2 -SafariZone_Northwest_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northwest_MapBorder - .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 deleted file mode 100644 index 4176cb370f..0000000000 --- a/data/layouts/SafariZone_RestHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_RestHouse_MapBorder:: - .incbin "data/layouts/SafariZone_RestHouse/border.bin" - -SafariZone_RestHouse_MapBlockdata:: - .incbin "data/layouts/SafariZone_RestHouse/map.bin" - - .align 2 -SafariZone_RestHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte SafariZone_RestHouse_MapBorder - .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 deleted file mode 100644 index ec83ba5b01..0000000000 --- a/data/layouts/SafariZone_South/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_South_MapBorder:: - .incbin "data/layouts/SafariZone_South/border.bin" - -SafariZone_South_MapBlockdata:: - .incbin "data/layouts/SafariZone_South/map.bin" - - .align 2 -SafariZone_South_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_South_MapBorder - .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 deleted file mode 100644 index e55309b46a..0000000000 --- a/data/layouts/SafariZone_Southeast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southeast_MapBorder:: - .incbin "data/layouts/SafariZone_Southeast/border.bin" - -SafariZone_Southeast_MapBlockdata:: - .incbin "data/layouts/SafariZone_Southeast/map.bin" - - .align 2 -SafariZone_Southeast_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southeast_MapBorder - .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 deleted file mode 100644 index 1236d4d4bf..0000000000 --- a/data/layouts/SafariZone_Southwest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southwest_MapBorder:: - .incbin "data/layouts/SafariZone_Southwest/border.bin" - -SafariZone_Southwest_MapBlockdata:: - .incbin "data/layouts/SafariZone_Southwest/map.bin" - - .align 2 -SafariZone_Southwest_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southwest_MapBorder - .4byte SafariZone_Southwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc deleted file mode 100644 index 897d873abe..0000000000 --- a/data/layouts/ScorchedSlab/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ScorchedSlab_MapBorder:: - .incbin "data/layouts/ScorchedSlab/border.bin" - -ScorchedSlab_MapBlockdata:: - .incbin "data/layouts/ScorchedSlab/map.bin" - - .align 2 -ScorchedSlab_Layout:: - .4byte 0xf - .4byte 0x14 - .4byte ScorchedSlab_MapBorder - .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 deleted file mode 100644 index 1d6ce495b6..0000000000 --- a/data/layouts/SeafloorCavern_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Entrance_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" - -SeafloorCavern_Entrance_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" - - .align 2 -SeafloorCavern_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Entrance_MapBorder - .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 deleted file mode 100644 index 7f7cf0570d..0000000000 --- a/data/layouts/SeafloorCavern_Room1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room1/border.bin" - -SeafloorCavern_Room1_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room1/map.bin" - - .align 2 -SeafloorCavern_Room1_Layout:: - .4byte 0x14 - .4byte 0x15 - .4byte SeafloorCavern_Room1_MapBorder - .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 deleted file mode 100644 index 89f4e6a792..0000000000 --- a/data/layouts/SeafloorCavern_Room2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room2_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room2/border.bin" - -SeafloorCavern_Room2_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room2/map.bin" - - .align 2 -SeafloorCavern_Room2_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte SeafloorCavern_Room2_MapBorder - .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 deleted file mode 100644 index 070842a9f5..0000000000 --- a/data/layouts/SeafloorCavern_Room3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room3_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room3/border.bin" - -SeafloorCavern_Room3_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room3/map.bin" - - .align 2 -SeafloorCavern_Room3_Layout:: - .4byte 0x10 - .4byte 0x11 - .4byte SeafloorCavern_Room3_MapBorder - .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 deleted file mode 100644 index 6c984109df..0000000000 --- a/data/layouts/SeafloorCavern_Room4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room4_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room4/border.bin" - -SeafloorCavern_Room4_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room4/map.bin" - - .align 2 -SeafloorCavern_Room4_Layout:: - .4byte 0x12 - .4byte 0x13 - .4byte SeafloorCavern_Room4_MapBorder - .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 deleted file mode 100644 index c48b00dbaa..0000000000 --- a/data/layouts/SeafloorCavern_Room5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room5_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room5/border.bin" - -SeafloorCavern_Room5_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room5/map.bin" - - .align 2 -SeafloorCavern_Room5_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Room5_MapBorder - .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 deleted file mode 100644 index f729d0b1b2..0000000000 --- a/data/layouts/SeafloorCavern_Room6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room6_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room6/border.bin" - -SeafloorCavern_Room6_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room6/map.bin" - - .align 2 -SeafloorCavern_Room6_Layout:: - .4byte 0x18 - .4byte 0x17 - .4byte SeafloorCavern_Room6_MapBorder - .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 deleted file mode 100644 index 784b9bbb95..0000000000 --- a/data/layouts/SeafloorCavern_Room7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room7_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room7/border.bin" - -SeafloorCavern_Room7_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room7/map.bin" - - .align 2 -SeafloorCavern_Room7_Layout:: - .4byte 0x17 - .4byte 0x19 - .4byte SeafloorCavern_Room7_MapBorder - .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 deleted file mode 100644 index 8f3d826c77..0000000000 --- a/data/layouts/SeafloorCavern_Room8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room8_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room8/border.bin" - -SeafloorCavern_Room8_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room8/map.bin" - - .align 2 -SeafloorCavern_Room8_Layout:: - .4byte 0xb - .4byte 0xe - .4byte SeafloorCavern_Room8_MapBorder - .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 deleted file mode 100644 index a5039da8f3..0000000000 --- a/data/layouts/SeafloorCavern_Room9/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room9_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room9/border.bin" - -SeafloorCavern_Room9_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room9/map.bin" - - .align 2 -SeafloorCavern_Room9_Layout:: - .4byte 0x1b - .4byte 0x2e - .4byte SeafloorCavern_Room9_MapBorder - .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 deleted file mode 100644 index 7a064d5f0c..0000000000 --- a/data/layouts/SealedChamber_InnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_InnerRoom_MapBorder:: - .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" - -SealedChamber_InnerRoom_MapBlockdata:: - .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" - - .align 2 -SealedChamber_InnerRoom_Layout:: - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_InnerRoom_MapBorder - .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 deleted file mode 100644 index bc6afaf291..0000000000 --- a/data/layouts/SealedChamber_OuterRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_OuterRoom_MapBorder:: - .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" - -SealedChamber_OuterRoom_MapBlockdata:: - .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" - - .align 2 -SealedChamber_OuterRoom_Layout:: - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_OuterRoom_MapBorder - .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 deleted file mode 100644 index ec138440a4..0000000000 --- a/data/layouts/SecretBase_BlueCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave1_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave1/border.bin" - -SecretBase_BlueCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave1/map.bin" - - .align 2 -SecretBase_BlueCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BlueCave1_MapBorder - .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 deleted file mode 100644 index 8c2b48661e..0000000000 --- a/data/layouts/SecretBase_BlueCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave2_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave2/border.bin" - -SecretBase_BlueCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave2/map.bin" - - .align 2 -SecretBase_BlueCave2_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_BlueCave2_MapBorder - .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 deleted file mode 100644 index 0ac8bee1be..0000000000 --- a/data/layouts/SecretBase_BlueCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave3_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave3/border.bin" - -SecretBase_BlueCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave3/map.bin" - - .align 2 -SecretBase_BlueCave3_Layout:: - .4byte 0xa - .4byte 0x11 - .4byte SecretBase_BlueCave3_MapBorder - .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 deleted file mode 100644 index d0e5ed45fa..0000000000 --- a/data/layouts/SecretBase_BlueCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave4_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave4/border.bin" - -SecretBase_BlueCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave4/map.bin" - - .align 2 -SecretBase_BlueCave4_Layout:: - .4byte 0x9 - .4byte 0x11 - .4byte SecretBase_BlueCave4_MapBorder - .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 deleted file mode 100644 index 9044fd6d1e..0000000000 --- a/data/layouts/SecretBase_BrownCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave1_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave1/border.bin" - -SecretBase_BrownCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave1/map.bin" - - .align 2 -SecretBase_BrownCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BrownCave1_MapBorder - .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 deleted file mode 100644 index 7cfb9573ba..0000000000 --- a/data/layouts/SecretBase_BrownCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave2_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave2/border.bin" - -SecretBase_BrownCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave2/map.bin" - - .align 2 -SecretBase_BrownCave2_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_BrownCave2_MapBorder - .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 deleted file mode 100644 index 5ad1bf5269..0000000000 --- a/data/layouts/SecretBase_BrownCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave3_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave3/border.bin" - -SecretBase_BrownCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave3/map.bin" - - .align 2 -SecretBase_BrownCave3_Layout:: - .4byte 0xf - .4byte 0xb - .4byte SecretBase_BrownCave3_MapBorder - .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 deleted file mode 100644 index 6094a38322..0000000000 --- a/data/layouts/SecretBase_BrownCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave4_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave4/border.bin" - -SecretBase_BrownCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave4/map.bin" - - .align 2 -SecretBase_BrownCave4_Layout:: - .4byte 0xe - .4byte 0xc - .4byte SecretBase_BrownCave4_MapBorder - .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 deleted file mode 100644 index a4664d5098..0000000000 --- a/data/layouts/SecretBase_RedCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave1_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave1/border.bin" - -SecretBase_RedCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave1/map.bin" - - .align 2 -SecretBase_RedCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_RedCave1_MapBorder - .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 deleted file mode 100644 index 7999395d85..0000000000 --- a/data/layouts/SecretBase_RedCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave2_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave2/border.bin" - -SecretBase_RedCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave2/map.bin" - - .align 2 -SecretBase_RedCave2_Layout:: - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_RedCave2_MapBorder - .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 deleted file mode 100644 index 6a3cc123b6..0000000000 --- a/data/layouts/SecretBase_RedCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave3_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave3/border.bin" - -SecretBase_RedCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave3/map.bin" - - .align 2 -SecretBase_RedCave3_Layout:: - .4byte 0xf - .4byte 0x8 - .4byte SecretBase_RedCave3_MapBorder - .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 deleted file mode 100644 index 665f44709c..0000000000 --- a/data/layouts/SecretBase_RedCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave4_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave4/border.bin" - -SecretBase_RedCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave4/map.bin" - - .align 2 -SecretBase_RedCave4_Layout:: - .4byte 0x9 - .4byte 0xf - .4byte SecretBase_RedCave4_MapBorder - .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 deleted file mode 100644 index 2bcc9f58a5..0000000000 --- a/data/layouts/SecretBase_Shrub1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub1_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub1/border.bin" - -SecretBase_Shrub1_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub1/map.bin" - - .align 2 -SecretBase_Shrub1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Shrub1_MapBorder - .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 deleted file mode 100644 index e94376c3b9..0000000000 --- a/data/layouts/SecretBase_Shrub2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub2_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub2/border.bin" - -SecretBase_Shrub2_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub2/map.bin" - - .align 2 -SecretBase_Shrub2_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_Shrub2_MapBorder - .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 deleted file mode 100644 index 449f1a11f0..0000000000 --- a/data/layouts/SecretBase_Shrub3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub3_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub3/border.bin" - -SecretBase_Shrub3_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub3/map.bin" - - .align 2 -SecretBase_Shrub3_Layout:: - .4byte 0xd - .4byte 0xb - .4byte SecretBase_Shrub3_MapBorder - .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 deleted file mode 100644 index 139a820503..0000000000 --- a/data/layouts/SecretBase_Shrub4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub4_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub4/border.bin" - -SecretBase_Shrub4_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub4/map.bin" - - .align 2 -SecretBase_Shrub4_Layout:: - .4byte 0xe - .4byte 0xb - .4byte SecretBase_Shrub4_MapBorder - .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 deleted file mode 100644 index 73e6e41a61..0000000000 --- a/data/layouts/SecretBase_Tree1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree1_MapBorder:: - .incbin "data/layouts/SecretBase_Tree1/border.bin" - -SecretBase_Tree1_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree1/map.bin" - - .align 2 -SecretBase_Tree1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Tree1_MapBorder - .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 deleted file mode 100644 index 95b122220d..0000000000 --- a/data/layouts/SecretBase_Tree2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree2_MapBorder:: - .incbin "data/layouts/SecretBase_Tree2/border.bin" - -SecretBase_Tree2_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_Layout:: - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .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 deleted file mode 100644 index 66716a4045..0000000000 --- a/data/layouts/SecretBase_Tree3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree3_MapBorder:: - .incbin "data/layouts/SecretBase_Tree3/border.bin" - -SecretBase_Tree3_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree3/map.bin" - - .align 2 -SecretBase_Tree3_Layout:: - .4byte 0x11 - .4byte 0x8 - .4byte SecretBase_Tree3_MapBorder - .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 deleted file mode 100644 index 20d4c3e018..0000000000 --- a/data/layouts/SecretBase_Tree4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree4_MapBorder:: - .incbin "data/layouts/SecretBase_Tree4/border.bin" - -SecretBase_Tree4_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree4/map.bin" - - .align 2 -SecretBase_Tree4_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SecretBase_Tree4_MapBorder - .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 deleted file mode 100644 index 7fa3aa8237..0000000000 --- a/data/layouts/SecretBase_YellowCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave1_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave1/border.bin" - -SecretBase_YellowCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave1/map.bin" - - .align 2 -SecretBase_YellowCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_YellowCave1_MapBorder - .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 deleted file mode 100644 index 0ae872e081..0000000000 --- a/data/layouts/SecretBase_YellowCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave2_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave2/border.bin" - -SecretBase_YellowCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave2/map.bin" - - .align 2 -SecretBase_YellowCave2_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_YellowCave2_MapBorder - .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 deleted file mode 100644 index f42d889208..0000000000 --- a/data/layouts/SecretBase_YellowCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave3_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave3/border.bin" - -SecretBase_YellowCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave3/map.bin" - - .align 2 -SecretBase_YellowCave3_Layout:: - .4byte 0xc - .4byte 0xb - .4byte SecretBase_YellowCave3_MapBorder - .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 deleted file mode 100644 index b7a11df5a3..0000000000 --- a/data/layouts/SecretBase_YellowCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave4_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave4/border.bin" - -SecretBase_YellowCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave4/map.bin" - - .align 2 -SecretBase_YellowCave4_Layout:: - .4byte 0xd - .4byte 0xe - .4byte SecretBase_YellowCave4_MapBorder - .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 deleted file mode 100644 index a52425e15c..0000000000 --- a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" - -ShoalCave_HighTideEntranceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_Layout:: - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_HighTideEntranceRoom_MapBorder - .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 deleted file mode 100644 index 2d323b9e07..0000000000 --- a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" - -ShoalCave_HighTideInnerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_Layout:: - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_HighTideInnerRoom_MapBorder - .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 deleted file mode 100644 index 0a1eee113e..0000000000 --- a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideEntranceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" - -ShoalCave_LowTideEntranceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_Layout:: - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_LowTideEntranceRoom_MapBorder - .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 deleted file mode 100644 index 6d7a515750..0000000000 --- a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideIceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" - -ShoalCave_LowTideIceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" - - .align 2 -ShoalCave_LowTideIceRoom_Layout:: - .4byte 0x14 - .4byte 0x1e - .4byte ShoalCave_LowTideIceRoom_MapBorder - .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 deleted file mode 100644 index f66fc97239..0000000000 --- a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideInnerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" - -ShoalCave_LowTideInnerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_Layout:: - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_LowTideInnerRoom_MapBorder - .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 deleted file mode 100644 index 79cc82e8c8..0000000000 --- a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideLowerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" - -ShoalCave_LowTideLowerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_Layout:: - .4byte 0x1f - .4byte 0xe - .4byte ShoalCave_LowTideLowerRoom_MapBorder - .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 deleted file mode 100644 index 62dbff40ee..0000000000 --- a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideStairsRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" - -ShoalCave_LowTideStairsRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte ShoalCave_LowTideStairsRoom_MapBorder - .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc deleted file mode 100644 index f42855de8a..0000000000 --- a/data/layouts/SingleBattleColosseum/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SingleBattleColosseum_MapBorder:: - .incbin "data/layouts/SingleBattleColosseum/border.bin" - -SingleBattleColosseum_MapBlockdata:: - .incbin "data/layouts/SingleBattleColosseum/map.bin" - - .align 2 -SingleBattleColosseum_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SingleBattleColosseum_MapBorder - .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 deleted file mode 100644 index 235f049352..0000000000 --- a/data/layouts/SkyPillar_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_1F_MapBorder:: - .incbin "data/layouts/SkyPillar_1F/border.bin" - -SkyPillar_1F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_1F/map.bin" - - .align 2 -SkyPillar_1F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_1F_MapBorder - .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 deleted file mode 100644 index 368fcd518e..0000000000 --- a/data/layouts/SkyPillar_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_2F_MapBorder:: - .incbin "data/layouts/SkyPillar_2F/border.bin" - -SkyPillar_2F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_2F/map.bin" - - .align 2 -SkyPillar_2F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_2F_MapBorder - .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 deleted file mode 100644 index 32ac95143a..0000000000 --- a/data/layouts/SkyPillar_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_3F_MapBorder:: - .incbin "data/layouts/SkyPillar_3F/border.bin" - -SkyPillar_3F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_3F/map.bin" - - .align 2 -SkyPillar_3F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_3F_MapBorder - .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 deleted file mode 100644 index 055abf133c..0000000000 --- a/data/layouts/SkyPillar_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_4F_MapBorder:: - .incbin "data/layouts/SkyPillar_4F/border.bin" - -SkyPillar_4F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_4F/map.bin" - - .align 2 -SkyPillar_4F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_4F_MapBorder - .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 deleted file mode 100644 index 3f3bb5bc10..0000000000 --- a/data/layouts/SkyPillar_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_5F_MapBorder:: - .incbin "data/layouts/SkyPillar_5F/border.bin" - -SkyPillar_5F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_5F/map.bin" - - .align 2 -SkyPillar_5F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_5F_MapBorder - .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 deleted file mode 100644 index 1313bd196f..0000000000 --- a/data/layouts/SkyPillar_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Entrance_MapBorder:: - .incbin "data/layouts/SkyPillar_Entrance/border.bin" - -SkyPillar_Entrance_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Entrance/map.bin" - - .align 2 -SkyPillar_Entrance_Layout:: - .4byte 0x12 - .4byte 0x12 - .4byte SkyPillar_Entrance_MapBorder - .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 deleted file mode 100644 index 5eb9df563b..0000000000 --- a/data/layouts/SkyPillar_Outside/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Outside_MapBorder:: - .incbin "data/layouts/SkyPillar_Outside/border.bin" - -SkyPillar_Outside_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Outside/map.bin" - - .align 2 -SkyPillar_Outside_Layout:: - .4byte 0x1c - .4byte 0x17 - .4byte SkyPillar_Outside_MapBorder - .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 deleted file mode 100644 index 646c6f95f8..0000000000 --- a/data/layouts/SkyPillar_Top/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Top_MapBorder:: - .incbin "data/layouts/SkyPillar_Top/border.bin" - -SkyPillar_Top_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Top/map.bin" - - .align 2 -SkyPillar_Top_Layout:: - .4byte 0x1b - .4byte 0x18 - .4byte SkyPillar_Top_MapBorder - .4byte SkyPillar_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc deleted file mode 100644 index dfa184764d..0000000000 --- a/data/layouts/SlateportCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_MapBorder:: - .incbin "data/layouts/SlateportCity/border.bin" - -SlateportCity_MapBlockdata:: - .incbin "data/layouts/SlateportCity/map.bin" - - .align 2 -SlateportCity_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte SlateportCity_MapBorder - .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 deleted file mode 100644 index f921eb5fcc..0000000000 --- a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_1F_MapBorder:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin" - -SlateportCity_OceanicMuseum_1F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_Layout:: - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_1F_MapBorder - .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 deleted file mode 100644 index 7a69989875..0000000000 --- a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_2F_MapBorder:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin" - -SlateportCity_OceanicMuseum_2F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_Layout:: - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_2F_MapBorder - .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 deleted file mode 100644 index 44f9a559f0..0000000000 --- a/data/layouts/SlateportCity_PokemonFanClub/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonFanClub_MapBorder:: - .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" - -SlateportCity_PokemonFanClub_MapBlockdata:: - .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" - - .align 2 -SlateportCity_PokemonFanClub_Layout:: - .4byte 0xe - .4byte 0xb - .4byte SlateportCity_PokemonFanClub_MapBorder - .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 deleted file mode 100644 index 00d5840c67..0000000000 --- a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_1F_MapBorder:: - .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin" - -SlateportCity_SternsShipyard_1F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_1F_MapBorder - .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 deleted file mode 100644 index 01a969a3a2..0000000000 --- a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_2F_MapBorder:: - .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin" - -SlateportCity_SternsShipyard_2F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_Layout:: - .4byte 0x11 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_2F_MapBorder - .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 deleted file mode 100644 index 400a29cbd5..0000000000 --- a/data/layouts/SootopolisCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MapBorder:: - .incbin "data/layouts/SootopolisCity/border.bin" - -SootopolisCity_MapBlockdata:: - .incbin "data/layouts/SootopolisCity/map.bin" - - .align 2 -SootopolisCity_Layout:: - .4byte 0x3c - .4byte 0x3c - .4byte SootopolisCity_MapBorder - .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 deleted file mode 100644 index 4c6a6eeef9..0000000000 --- a/data/layouts/SootopolisCity_Gym_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin" - -SootopolisCity_Gym_1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin" - - .align 2 -SootopolisCity_Gym_1F_Layout:: - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_1F_MapBorder - .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 deleted file mode 100644 index 7eb90fb71e..0000000000 --- a/data/layouts/SootopolisCity_Gym_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_B1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin" - -SootopolisCity_Gym_B1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin" - - .align 2 -SootopolisCity_Gym_B1F_Layout:: - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_B1F_MapBorder - .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 deleted file mode 100644 index 1ad9cc41c9..0000000000 --- a/data/layouts/SootopolisCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House1_MapBorder:: - .incbin "data/layouts/SootopolisCity_House1/border.bin" - -SootopolisCity_House1_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House1/map.bin" - - .align 2 -SootopolisCity_House1_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House1_MapBorder - .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 deleted file mode 100644 index 9007d584bc..0000000000 --- a/data/layouts/SootopolisCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House2_MapBorder:: - .incbin "data/layouts/SootopolisCity_House2/border.bin" - -SootopolisCity_House2_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House2/map.bin" - - .align 2 -SootopolisCity_House2_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House2_MapBorder - .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 deleted file mode 100644 index 540f4306cd..0000000000 --- a/data/layouts/SootopolisCity_House3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House3_MapBorder:: - .incbin "data/layouts/SootopolisCity_House3/border.bin" - -SootopolisCity_House3_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House3/map.bin" - - .align 2 -SootopolisCity_House3_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House3_MapBorder - .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 deleted file mode 100644 index 152563eb60..0000000000 --- a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse_MapBorder:: - .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" - -SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" - - .align 2 -SootopolisCity_LotadAndSeedotHouse_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder - .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 deleted file mode 100644 index 0b846950ed..0000000000 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin" - -SootopolisCity_MysteryEventsHouse_1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder - .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 deleted file mode 100644 index 1bb92b9339..0000000000 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin" - -SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder - .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 deleted file mode 100644 index 4a62cd3f5d..0000000000 --- a/data/layouts/SouthernIsland_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Exterior_MapBorder:: - .incbin "data/layouts/SouthernIsland_Exterior/border.bin" - -SouthernIsland_Exterior_MapBlockdata:: - .incbin "data/layouts/SouthernIsland_Exterior/map.bin" - - .align 2 -SouthernIsland_Exterior_Layout:: - .4byte 0x21 - .4byte 0x1e - .4byte SouthernIsland_Exterior_MapBorder - .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 deleted file mode 100644 index b4d9a35d29..0000000000 --- a/data/layouts/SouthernIsland_Interior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Interior_MapBorder:: - .incbin "data/layouts/SouthernIsland_Interior/border.bin" - -SouthernIsland_Interior_MapBlockdata:: - .incbin "data/layouts/SouthernIsland_Interior/map.bin" - - .align 2 -SouthernIsland_Interior_Layout:: - .4byte 0x1b - .4byte 0x18 - .4byte SouthernIsland_Interior_MapBorder - .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 deleted file mode 100644 index 0865a8e5bb..0000000000 --- a/data/layouts/TerraCave_End/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_End_MapBorder:: - .incbin "data/layouts/TerraCave_End/border.bin" - -TerraCave_End_MapBlockdata:: - .incbin "data/layouts/TerraCave_End/map.bin" - - .align 2 -TerraCave_End_Layout:: - .4byte 0x1b - .4byte 0x1e - .4byte TerraCave_End_MapBorder - .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 deleted file mode 100644 index 19d50ef442..0000000000 --- a/data/layouts/TerraCave_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_Entrance_MapBorder:: - .incbin "data/layouts/TerraCave_Entrance/border.bin" - -TerraCave_Entrance_MapBlockdata:: - .incbin "data/layouts/TerraCave_Entrance/map.bin" - - .align 2 -TerraCave_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte TerraCave_Entrance_MapBorder - .4byte TerraCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc deleted file mode 100644 index 5e0297e7ad..0000000000 --- a/data/layouts/TradeCenter/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TradeCenter_MapBorder:: - .incbin "data/layouts/TradeCenter/border.bin" - -TradeCenter_MapBlockdata:: - .incbin "data/layouts/TradeCenter/map.bin" - - .align 2 -TradeCenter_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte TradeCenter_MapBorder - .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 deleted file mode 100644 index 2009cd49e5..0000000000 --- a/data/layouts/TrainerHill_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_1F_MapBorder:: - .incbin "data/layouts/TrainerHill_1F/border.bin" - -TrainerHill_1F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_1F/map.bin" - - .align 2 -TrainerHill_1F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_1F_MapBorder - .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 deleted file mode 100644 index f67b54bf1d..0000000000 --- a/data/layouts/TrainerHill_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_2F_MapBorder:: - .incbin "data/layouts/TrainerHill_2F/border.bin" - -TrainerHill_2F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_2F/map.bin" - - .align 2 -TrainerHill_2F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_2F_MapBorder - .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 deleted file mode 100644 index 280517f410..0000000000 --- a/data/layouts/TrainerHill_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_3F_MapBorder:: - .incbin "data/layouts/TrainerHill_3F/border.bin" - -TrainerHill_3F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_3F/map.bin" - - .align 2 -TrainerHill_3F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_3F_MapBorder - .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 deleted file mode 100644 index eed0b01209..0000000000 --- a/data/layouts/TrainerHill_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_4F_MapBorder:: - .incbin "data/layouts/TrainerHill_4F/border.bin" - -TrainerHill_4F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_4F/map.bin" - - .align 2 -TrainerHill_4F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_4F_MapBorder - .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 deleted file mode 100644 index 896f43e0d4..0000000000 --- a/data/layouts/TrainerHill_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Entrance_MapBorder:: - .incbin "data/layouts/TrainerHill_Entrance/border.bin" - -TrainerHill_Entrance_MapBlockdata:: - .incbin "data/layouts/TrainerHill_Entrance/map.bin" - - .align 2 -TrainerHill_Entrance_Layout:: - .4byte 0x13 - .4byte 0x11 - .4byte TrainerHill_Entrance_MapBorder - .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 deleted file mode 100644 index 9477dceda9..0000000000 --- a/data/layouts/TrainerHill_Roof/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Roof_MapBorder:: - .incbin "data/layouts/TrainerHill_Roof/border.bin" - -TrainerHill_Roof_MapBlockdata:: - .incbin "data/layouts/TrainerHill_Roof/map.bin" - - .align 2 -TrainerHill_Roof_Layout:: - .4byte 0x19 - .4byte 0x10 - .4byte TrainerHill_Roof_MapBorder - .4byte TrainerHill_Roof_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc deleted file mode 100644 index 8e027bbd28..0000000000 --- a/data/layouts/Underwater1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater1_MapBorder:: - .incbin "data/layouts/Underwater1/border.bin" - -Underwater1_MapBlockdata:: - .incbin "data/layouts/Underwater1/map.bin" - - .align 2 -Underwater1_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater1_MapBorder - .4byte Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc deleted file mode 100644 index ac6350d474..0000000000 --- a/data/layouts/Underwater2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater2_MapBorder:: - .incbin "data/layouts/Underwater2/border.bin" - -Underwater2_MapBlockdata:: - .incbin "data/layouts/Underwater2/map.bin" - - .align 2 -Underwater2_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater2_MapBorder - .4byte Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc deleted file mode 100644 index c365b6b8f5..0000000000 --- a/data/layouts/Underwater3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater3_MapBorder:: - .incbin "data/layouts/Underwater3/border.bin" - -Underwater3_MapBlockdata:: - .incbin "data/layouts/Underwater3/map.bin" - - .align 2 -Underwater3_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater3_MapBorder - .4byte Underwater3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc deleted file mode 100644 index 9e22e4e409..0000000000 --- a/data/layouts/Underwater4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater4_MapBorder:: - .incbin "data/layouts/Underwater4/border.bin" - -Underwater4_MapBlockdata:: - .incbin "data/layouts/Underwater4/map.bin" - - .align 2 -Underwater4_Layout:: - .4byte 0x78 - .4byte 0x28 - .4byte Underwater4_MapBorder - .4byte Underwater4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc deleted file mode 100644 index 6394eec544..0000000000 --- a/data/layouts/Underwater5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater5_MapBorder:: - .incbin "data/layouts/Underwater5/border.bin" - -Underwater5_MapBlockdata:: - .incbin "data/layouts/Underwater5/map.bin" - - .align 2 -Underwater5_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Underwater5_MapBorder - .4byte Underwater5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc deleted file mode 100644 index 247af44bdb..0000000000 --- a/data/layouts/Underwater6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater6_MapBorder:: - .incbin "data/layouts/Underwater6/border.bin" - -Underwater6_MapBlockdata:: - .incbin "data/layouts/Underwater6/map.bin" - - .align 2 -Underwater6_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Underwater6_MapBorder - .4byte Underwater6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc deleted file mode 100644 index 5c2670b111..0000000000 --- a/data/layouts/Underwater7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater7_MapBorder:: - .incbin "data/layouts/Underwater7/border.bin" - -Underwater7_MapBlockdata:: - .incbin "data/layouts/Underwater7/map.bin" - - .align 2 -Underwater7_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Underwater7_MapBorder - .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 deleted file mode 100644 index 52a3a7851c..0000000000 --- a/data/layouts/Underwater_MarineCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_MarineCave_MapBorder:: - .incbin "data/layouts/Underwater_MarineCave/border.bin" - -Underwater_MarineCave_MapBlockdata:: - .incbin "data/layouts/Underwater_MarineCave/map.bin" - - .align 2 -Underwater_MarineCave_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte Underwater_MarineCave_MapBorder - .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 deleted file mode 100644 index 1534564a46..0000000000 --- a/data/layouts/Underwater_Route134/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_Route134_MapBorder:: - .incbin "data/layouts/Underwater_Route134/border.bin" - -Underwater_Route134_MapBlockdata:: - .incbin "data/layouts/Underwater_Route134/map.bin" - - .align 2 -Underwater_Route134_Layout:: - .4byte 0x12 - .4byte 0xa - .4byte Underwater_Route134_MapBorder - .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 deleted file mode 100644 index 5bce06a6b1..0000000000 --- a/data/layouts/Underwater_SeafloorCavern/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SeafloorCavern_MapBorder:: - .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" - -Underwater_SeafloorCavern_MapBlockdata:: - .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" - - .align 2 -Underwater_SeafloorCavern_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte Underwater_SeafloorCavern_MapBorder - .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 deleted file mode 100644 index 5baf5dde85..0000000000 --- a/data/layouts/Underwater_SealedChamber/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SealedChamber_MapBorder:: - .incbin "data/layouts/Underwater_SealedChamber/border.bin" - -Underwater_SealedChamber_MapBlockdata:: - .incbin "data/layouts/Underwater_SealedChamber/map.bin" - - .align 2 -Underwater_SealedChamber_Layout:: - .4byte 0x16 - .4byte 0x30 - .4byte Underwater_SealedChamber_MapBorder - .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 deleted file mode 100644 index 4a1b0aa026..0000000000 --- a/data/layouts/Underwater_SootopolisCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SootopolisCity_MapBorder:: - .incbin "data/layouts/Underwater_SootopolisCity/border.bin" - -Underwater_SootopolisCity_MapBlockdata:: - .incbin "data/layouts/Underwater_SootopolisCity/map.bin" - - .align 2 -Underwater_SootopolisCity_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte Underwater_SootopolisCity_MapBorder - .4byte Underwater_SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc deleted file mode 100644 index 0c2a065a55..0000000000 --- a/data/layouts/UnionRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnionRoom_MapBorder:: - .incbin "data/layouts/UnionRoom/border.bin" - -UnionRoom_MapBlockdata:: - .incbin "data/layouts/UnionRoom/map.bin" - - .align 2 -UnionRoom_Layout:: - .4byte 0xf - .4byte 0xc - .4byte UnionRoom_MapBorder - .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 deleted file mode 100644 index 41e954b4ed..0000000000 --- a/data/layouts/UnknownMap_08417FC4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08417FC4_MapBorder:: - .incbin "data/layouts/UnknownMap_08417FC4/border.bin" - -UnknownMap_08417FC4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08417FC4/map.bin" - - .align 2 -UnknownMap_08417FC4_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte UnknownMap_08417FC4_MapBorder - .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 deleted file mode 100644 index f1695ec66b..0000000000 --- a/data/layouts/UnknownMap_08428450/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08428450_MapBorder:: - .incbin "data/layouts/UnknownMap_08428450/border.bin" - -UnknownMap_08428450_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08428450/map.bin" - - .align 2 -UnknownMap_08428450_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_08428450_MapBorder - .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 deleted file mode 100644 index f19bd682d7..0000000000 --- a/data/layouts/UnknownMap_084294C4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084294C4_MapBorder:: - .incbin "data/layouts/UnknownMap_084294C4/border.bin" - -UnknownMap_084294C4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084294C4/map.bin" - - .align 2 -UnknownMap_084294C4_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084294C4_MapBorder - .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 deleted file mode 100644 index e351524e16..0000000000 --- a/data/layouts/UnknownMap_084294E8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084294E8_MapBorder:: - .incbin "data/layouts/UnknownMap_084294E8/border.bin" - -UnknownMap_084294E8_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084294E8/map.bin" - - .align 2 -UnknownMap_084294E8_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084294E8_MapBorder - .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 deleted file mode 100644 index fd01ddc105..0000000000 --- a/data/layouts/UnknownMap_0843E6C0/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E6C0_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" - -UnknownMap_0843E6C0_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" - - .align 2 -UnknownMap_0843E6C0_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E6C0_MapBorder - .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 deleted file mode 100644 index 80ad931275..0000000000 --- a/data/layouts/UnknownMap_0843E6E4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E6E4_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" - -UnknownMap_0843E6E4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" - - .align 2 -UnknownMap_0843E6E4_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E6E4_MapBorder - .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 deleted file mode 100644 index 16d4e400ca..0000000000 --- a/data/layouts/UnknownMap_0843E708/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E708_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E708/border.bin" - -UnknownMap_0843E708_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E708/map.bin" - - .align 2 -UnknownMap_0843E708_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E708_MapBorder - .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 deleted file mode 100644 index c6541b3ea9..0000000000 --- a/data/layouts/UnknownMap_0843E72C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E72C_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E72C/border.bin" - -UnknownMap_0843E72C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E72C/map.bin" - - .align 2 -UnknownMap_0843E72C_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E72C_MapBorder - .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 deleted file mode 100644 index e566a93b71..0000000000 --- a/data/layouts/UnknownMap_0843E750/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E750_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E750/border.bin" - -UnknownMap_0843E750_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E750/map.bin" - - .align 2 -UnknownMap_0843E750_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E750_MapBorder - .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 deleted file mode 100644 index ce1a438eb0..0000000000 --- a/data/layouts/UnknownMap_0843E774/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E774_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E774/border.bin" - -UnknownMap_0843E774_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E774/map.bin" - - .align 2 -UnknownMap_0843E774_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E774_MapBorder - .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 deleted file mode 100644 index 179e0d881d..0000000000 --- a/data/layouts/UnknownMap_0843E798/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E798_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E798/border.bin" - -UnknownMap_0843E798_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E798/map.bin" - - .align 2 -UnknownMap_0843E798_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E798_MapBorder - .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 deleted file mode 100644 index 907ec6266d..0000000000 --- a/data/layouts/UnknownMap_0843E7BC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E7BC_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" - -UnknownMap_0843E7BC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" - - .align 2 -UnknownMap_0843E7BC_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E7BC_MapBorder - .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 deleted file mode 100644 index c56046ef18..0000000000 --- a/data/layouts/UnknownMap_0843E7E0/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E7E0_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" - -UnknownMap_0843E7E0_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" - - .align 2 -UnknownMap_0843E7E0_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E7E0_MapBorder - .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 deleted file mode 100644 index 49e32dbc76..0000000000 --- a/data/layouts/UnknownMap_0843E804/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E804_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E804/border.bin" - -UnknownMap_0843E804_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E804/map.bin" - - .align 2 -UnknownMap_0843E804_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E804_MapBorder - .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 deleted file mode 100644 index 3cbe672998..0000000000 --- a/data/layouts/UnknownMap_0843E828/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E828_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E828/border.bin" - -UnknownMap_0843E828_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E828/map.bin" - - .align 2 -UnknownMap_0843E828_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E828_MapBorder - .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 deleted file mode 100644 index 7449536bf7..0000000000 --- a/data/layouts/UnknownMap_0843E84C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E84C_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E84C/border.bin" - -UnknownMap_0843E84C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E84C/map.bin" - - .align 2 -UnknownMap_0843E84C_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E84C_MapBorder - .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 deleted file mode 100644 index 23880a79c7..0000000000 --- a/data/layouts/UnknownMap_0843E870/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E870_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E870/border.bin" - -UnknownMap_0843E870_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E870/map.bin" - - .align 2 -UnknownMap_0843E870_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E870_MapBorder - .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 deleted file mode 100755 index e42bfcdd96..0000000000 --- a/data/layouts/UnknownMap_0843E894/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E894_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E894/border.bin" - -UnknownMap_0843E894_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E894/map.bin" - - .align 2 -UnknownMap_0843E894_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E894_MapBorder - .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 deleted file mode 100644 index 39d7bb18ab..0000000000 --- a/data/layouts/UnknownMap_08447028/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08447028_MapBorder:: - .incbin "data/layouts/UnknownMap_08447028/border.bin" - -UnknownMap_08447028_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08447028/map.bin" - - .align 2 -UnknownMap_08447028_Layout:: - .4byte 0x3A - .4byte 0x1A - .4byte UnknownMap_08447028_MapBorder - .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 deleted file mode 100644 index a180340f8b..0000000000 --- a/data/layouts/UnknownMap_0845A394/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845A394_MapBorder:: - .incbin "data/layouts/UnknownMap_0845A394/border.bin" - -UnknownMap_0845A394_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845A394/map.bin" - - .align 2 -UnknownMap_0845A394_Layout:: - .4byte 0x13 - .4byte 0x13 - .4byte UnknownMap_0845A394_MapBorder - .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 deleted file mode 100644 index ce6a4c819a..0000000000 --- a/data/layouts/UnknownMap_0845D470/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845D470_MapBorder:: - .incbin "data/layouts/UnknownMap_0845D470/border.bin" - -UnknownMap_0845D470_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845D470/map.bin" - - .align 2 -UnknownMap_0845D470_Layout:: - .4byte 0x3C - .4byte 0x28 - .4byte UnknownMap_0845D470_MapBorder - .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 deleted file mode 100644 index 535c4a6e9a..0000000000 --- a/data/layouts/UnknownMap_0845ECB4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845ECB4_MapBorder:: - .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" - -UnknownMap_0845ECB4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" - - .align 2 -UnknownMap_0845ECB4_Layout:: - .4byte 0x1B - .4byte 0x2E - .4byte UnknownMap_0845ECB4_MapBorder - .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 deleted file mode 100644 index 22191c61cf..0000000000 --- a/data/layouts/UnknownMap_08469200/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08469200_MapBorder:: - .incbin "data/layouts/UnknownMap_08469200/border.bin" - -UnknownMap_08469200_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08469200/map.bin" - - .align 2 -UnknownMap_08469200_Layout:: - .4byte 0x3C - .4byte 0x3C - .4byte UnknownMap_08469200_MapBorder - .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 deleted file mode 100644 index 0106c666a5..0000000000 --- a/data/layouts/UnknownMap_084693AC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084693AC_MapBorder:: - .incbin "data/layouts/UnknownMap_084693AC/border.bin" - -UnknownMap_084693AC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084693AC/map.bin" - - .align 2 -UnknownMap_084693AC_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084693AC_MapBorder - .4byte UnknownMap_084693AC_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc deleted file mode 100644 index b440362392..0000000000 --- a/data/layouts/UnknownMap_08480DAC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08480DAC_MapBorder:: - .incbin "data/layouts/UnknownMap_08480DAC/border.bin" - -UnknownMap_08480DAC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08480DAC/map.bin" - - .align 2 -UnknownMap_08480DAC_Layout:: - .4byte 0xD - .4byte 0xD - .4byte UnknownMap_08480DAC_MapBorder - .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 deleted file mode 100644 index 4593a8ba47..0000000000 --- a/data/layouts/UnknownMap_08480F54/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08480F54_MapBorder:: - .incbin "data/layouts/UnknownMap_08480F54/border.bin" - -UnknownMap_08480F54_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08480F54/map.bin" - - .align 2 -UnknownMap_08480F54_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_08480F54_MapBorder - .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 deleted file mode 100644 index 6b73bfdcee..0000000000 --- a/data/layouts/UnknownMap_084810FC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084810FC_MapBorder:: - .incbin "data/layouts/UnknownMap_084810FC/border.bin" - -UnknownMap_084810FC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084810FC/map.bin" - - .align 2 -UnknownMap_084810FC_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084810FC_MapBorder - .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 deleted file mode 100644 index a394c8ef3f..0000000000 --- a/data/layouts/UnknownMap_084812A4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084812A4_MapBorder:: - .incbin "data/layouts/UnknownMap_084812A4/border.bin" - -UnknownMap_084812A4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084812A4/map.bin" - - .align 2 -UnknownMap_084812A4_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084812A4_MapBorder - .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 deleted file mode 100644 index cabe0b25b2..0000000000 --- a/data/layouts/UnknownMap_0848144C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0848144C_MapBorder:: - .incbin "data/layouts/UnknownMap_0848144C/border.bin" - -UnknownMap_0848144C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0848144C/map.bin" - - .align 2 -UnknownMap_0848144C_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_0848144C_MapBorder - .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 deleted file mode 100644 index 73ed49c79a..0000000000 --- a/data/layouts/UnknownMap_084815F4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084815F4_MapBorder:: - .incbin "data/layouts/UnknownMap_084815F4/border.bin" - -UnknownMap_084815F4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084815F4/map.bin" - - .align 2 -UnknownMap_084815F4_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084815F4_MapBorder - .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 deleted file mode 100644 index 250528be04..0000000000 --- a/data/layouts/UnknownMap_08481B24/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08481B24_MapBorder:: - .incbin "data/layouts/UnknownMap_08481B24/border.bin" - -UnknownMap_08481B24_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08481B24/map.bin" - - .align 2 -UnknownMap_08481B24_Layout:: - .4byte 0x1B - .4byte 0x18 - .4byte UnknownMap_08481B24_MapBorder - .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 deleted file mode 100644 index 465b92dc82..0000000000 --- a/data/layouts/UnknownMap_08481DBC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08481DBC_MapBorder:: - .incbin "data/layouts/UnknownMap_08481DBC/border.bin" - -UnknownMap_08481DBC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08481DBC/map.bin" - - .align 2 -UnknownMap_08481DBC_Layout:: - .4byte 0xB - .4byte 0x8 - .4byte UnknownMap_08481DBC_MapBorder - .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 deleted file mode 100644 index bb7002a20e..0000000000 --- a/data/layouts/UnknownMap_25_29/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_29_MapBorder:: - .incbin "data/layouts/UnknownMap_25_29/border.bin" - -UnknownMap_25_29_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_29/map.bin" - - .align 2 -UnknownMap_25_29_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_29_MapBorder - .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 deleted file mode 100644 index 5937a21952..0000000000 --- a/data/layouts/UnknownMap_25_30/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_30_MapBorder:: - .incbin "data/layouts/UnknownMap_25_30/border.bin" - -UnknownMap_25_30_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_30/map.bin" - - .align 2 -UnknownMap_25_30_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_30_MapBorder - .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 deleted file mode 100644 index 3dcbc7986a..0000000000 --- a/data/layouts/UnknownMap_25_31/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_31_MapBorder:: - .incbin "data/layouts/UnknownMap_25_31/border.bin" - -UnknownMap_25_31_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_31/map.bin" - - .align 2 -UnknownMap_25_31_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_31_MapBorder - .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 deleted file mode 100644 index 0ffe4c0b7c..0000000000 --- a/data/layouts/UnknownMap_25_32/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_32_MapBorder:: - .incbin "data/layouts/UnknownMap_25_32/border.bin" - -UnknownMap_25_32_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_32/map.bin" - - .align 2 -UnknownMap_25_32_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_32_MapBorder - .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 deleted file mode 100644 index 3f8113a6fb..0000000000 --- a/data/layouts/UnknownMap_25_33/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_33_MapBorder:: - .incbin "data/layouts/UnknownMap_25_33/border.bin" - -UnknownMap_25_33_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_33/map.bin" - - .align 2 -UnknownMap_25_33_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_33_MapBorder - .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 deleted file mode 100644 index 6001d8fe79..0000000000 --- a/data/layouts/UnknownMap_25_34/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_34_MapBorder:: - .incbin "data/layouts/UnknownMap_25_34/border.bin" - -UnknownMap_25_34_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_34/map.bin" - - .align 2 -UnknownMap_25_34_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_34_MapBorder - .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 deleted file mode 100644 index ce58c0798e..0000000000 --- a/data/layouts/VerdanturfTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_MapBorder:: - .incbin "data/layouts/VerdanturfTown/border.bin" - -VerdanturfTown_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown/map.bin" - - .align 2 -VerdanturfTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte VerdanturfTown_MapBorder - .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 deleted file mode 100644 index 21fca69535..0000000000 --- a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom_MapBorder:: - .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" - -VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" - - .align 2 -VerdanturfTown_BattleTentBattleRoom_Layout:: - .4byte 0xd - .4byte 0x9 - .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder - .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 deleted file mode 100644 index ae5d1a7cf6..0000000000 --- a/data/layouts/VerdanturfTown_WandasHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_WandasHouse_MapBorder:: - .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" - -VerdanturfTown_WandasHouse_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" - - .align 2 -VerdanturfTown_WandasHouse_Layout:: - .4byte 0x11 - .4byte 0x8 - .4byte VerdanturfTown_WandasHouse_MapBorder - .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 deleted file mode 100644 index 31e0fede38..0000000000 --- a/data/layouts/VictoryRoad_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_1F_MapBorder:: - .incbin "data/layouts/VictoryRoad_1F/border.bin" - -VictoryRoad_1F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_1F/map.bin" - - .align 2 -VictoryRoad_1F_Layout:: - .4byte 0x2e - .4byte 0x2d - .4byte VictoryRoad_1F_MapBorder - .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 deleted file mode 100644 index 9ce7223e1e..0000000000 --- a/data/layouts/VictoryRoad_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B1F_MapBorder:: - .incbin "data/layouts/VictoryRoad_B1F/border.bin" - -VictoryRoad_B1F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_B1F/map.bin" - - .align 2 -VictoryRoad_B1F_Layout:: - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B1F_MapBorder - .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 deleted file mode 100644 index 23c500cbe4..0000000000 --- a/data/layouts/VictoryRoad_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B2F_MapBorder:: - .incbin "data/layouts/VictoryRoad_B2F/border.bin" - -VictoryRoad_B2F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_B2F/map.bin" - - .align 2 -VictoryRoad_B2F_Layout:: - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B2F_MapBorder - .4byte VictoryRoad_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json new file mode 100644 index 0000000000..b6e31981d9 --- /dev/null +++ b/data/layouts/layouts.json @@ -0,0 +1,4415 @@ +{ + "layouts_table_label": "gMapLayouts", + "layouts": [ + { + "id": "LAYOUT_PETALBURG_CITY", + "name": "PetalburgCity_Layout", + "width": 30, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/PetalburgCity/border.bin", + "blockdata_filepath": "data/layouts/PetalburgCity/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY", + "name": "SlateportCity_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/SlateportCity/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY", + "name": "MauvilleCity_Layout", + "width": 40, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/MauvilleCity/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY", + "name": "RustboroCity_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/RustboroCity/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY", + "name": "FortreeCity_Layout", + "width": 40, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/FortreeCity/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY", + "name": "LilycoveCity_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/LilycoveCity/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY", + "name": "MossdeepCity_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/MossdeepCity/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY", + "name": "SootopolisCity_Layout", + "width": 60, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Sootopolis", + "border_filepath": "data/layouts/SootopolisCity/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY", + "name": "EverGrandeCity_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_EverGrande", + "border_filepath": "data/layouts/EverGrandeCity/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN", + "name": "LittlerootTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/LittlerootTown/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown/map.bin" + }, + { + "id": "LAYOUT_OLDALE_TOWN", + "name": "OldaleTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/OldaleTown/border.bin", + "blockdata_filepath": "data/layouts/OldaleTown/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN", + "name": "DewfordTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/DewfordTown/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN", + "name": "LavaridgeTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/LavaridgeTown/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN", + "name": "FallarborTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/FallarborTown/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN", + "name": "VerdanturfTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/VerdanturfTown/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN", + "name": "PacifidlogTown_Layout", + "width": 20, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/PacifidlogTown/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown/map.bin" + }, + { + "id": "LAYOUT_ROUTE101", + "name": "Route101_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route101/border.bin", + "blockdata_filepath": "data/layouts/Route101/map.bin" + }, + { + "id": "LAYOUT_ROUTE102", + "name": "Route102_Layout", + "width": 50, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route102/border.bin", + "blockdata_filepath": "data/layouts/Route102/map.bin" + }, + { + "id": "LAYOUT_ROUTE103", + "name": "Route103_Layout", + "width": 80, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route103/border.bin", + "blockdata_filepath": "data/layouts/Route103/map.bin" + }, + { + "id": "LAYOUT_ROUTE104", + "name": "Route104_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route104/border.bin", + "blockdata_filepath": "data/layouts/Route104/map.bin" + }, + { + "id": "LAYOUT_ROUTE105", + "name": "Route105_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route105/border.bin", + "blockdata_filepath": "data/layouts/Route105/map.bin" + }, + { + "id": "LAYOUT_ROUTE106", + "name": "Route106_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route106/border.bin", + "blockdata_filepath": "data/layouts/Route106/map.bin" + }, + { + "id": "LAYOUT_ROUTE107", + "name": "Route107_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route107/border.bin", + "blockdata_filepath": "data/layouts/Route107/map.bin" + }, + { + "id": "LAYOUT_ROUTE108", + "name": "Route108_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/Route108/border.bin", + "blockdata_filepath": "data/layouts/Route108/map.bin" + }, + { + "id": "LAYOUT_ROUTE109", + "name": "Route109_Layout", + "width": 40, + "height": 63, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/Route109/border.bin", + "blockdata_filepath": "data/layouts/Route109/map.bin" + }, + { + "id": "LAYOUT_ROUTE110", + "name": "Route110_Layout", + "width": 40, + "height": 100, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route110/border.bin", + "blockdata_filepath": "data/layouts/Route110/map.bin" + }, + { + "id": "LAYOUT_ROUTE111", + "name": "Route111_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route111/border.bin", + "blockdata_filepath": "data/layouts/Route111/map.bin" + }, + { + "id": "LAYOUT_ROUTE112", + "name": "Route112_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/Route112/border.bin", + "blockdata_filepath": "data/layouts/Route112/map.bin" + }, + { + "id": "LAYOUT_ROUTE113", + "name": "Route113_Layout", + "width": 100, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route113/border.bin", + "blockdata_filepath": "data/layouts/Route113/map.bin" + }, + { + "id": "LAYOUT_ROUTE114", + "name": "Route114_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route114/border.bin", + "blockdata_filepath": "data/layouts/Route114/map.bin" + }, + { + "id": "LAYOUT_ROUTE115", + "name": "Route115_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route115/border.bin", + "blockdata_filepath": "data/layouts/Route115/map.bin" + }, + { + "id": "LAYOUT_ROUTE116", + "name": "Route116_Layout", + "width": 100, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route116/border.bin", + "blockdata_filepath": "data/layouts/Route116/map.bin" + }, + { + "id": "LAYOUT_ROUTE117", + "name": "Route117_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route117/border.bin", + "blockdata_filepath": "data/layouts/Route117/map.bin" + }, + { + "id": "LAYOUT_ROUTE118", + "name": "Route118_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route118/border.bin", + "blockdata_filepath": "data/layouts/Route118/map.bin" + }, + { + "id": "LAYOUT_ROUTE119", + "name": "Route119_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/Route119/border.bin", + "blockdata_filepath": "data/layouts/Route119/map.bin" + }, + { + "id": "LAYOUT_ROUTE120", + "name": "Route120_Layout", + "width": 40, + "height": 100, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/Route120/border.bin", + "blockdata_filepath": "data/layouts/Route120/map.bin" + }, + { + "id": "LAYOUT_ROUTE121", + "name": "Route121_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route121/border.bin", + "blockdata_filepath": "data/layouts/Route121/map.bin" + }, + { + "id": "LAYOUT_ROUTE122", + "name": "Route122_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route122/border.bin", + "blockdata_filepath": "data/layouts/Route122/map.bin" + }, + { + "id": "LAYOUT_ROUTE123", + "name": "Route123_Layout", + "width": 140, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route123/border.bin", + "blockdata_filepath": "data/layouts/Route123/map.bin" + }, + { + "id": "LAYOUT_ROUTE124", + "name": "Route124_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route124/border.bin", + "blockdata_filepath": "data/layouts/Route124/map.bin" + }, + { + "id": "LAYOUT_ROUTE125", + "name": "Route125_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route125/border.bin", + "blockdata_filepath": "data/layouts/Route125/map.bin" + }, + { + "id": "LAYOUT_ROUTE126", + "name": "Route126_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route126/border.bin", + "blockdata_filepath": "data/layouts/Route126/map.bin" + }, + { + "id": "LAYOUT_ROUTE127", + "name": "Route127_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route127/border.bin", + "blockdata_filepath": "data/layouts/Route127/map.bin" + }, + { + "id": "LAYOUT_ROUTE128", + "name": "Route128_Layout", + "width": 120, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route128/border.bin", + "blockdata_filepath": "data/layouts/Route128/map.bin" + }, + { + "id": "LAYOUT_ROUTE129", + "name": "Route129_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route129/border.bin", + "blockdata_filepath": "data/layouts/Route129/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08417FC4", + "name": "UnknownMap_08417FC4_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.bin" + }, + { + "id": "LAYOUT_ROUTE131", + "name": "Route131_Layout", + "width": 60, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route131/border.bin", + "blockdata_filepath": "data/layouts/Route131/map.bin" + }, + { + "id": "LAYOUT_ROUTE132", + "name": "Route132_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route132/border.bin", + "blockdata_filepath": "data/layouts/Route132/map.bin" + }, + { + "id": "LAYOUT_ROUTE133", + "name": "Route133_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route133/border.bin", + "blockdata_filepath": "data/layouts/Route133/map.bin" + }, + { + "id": "LAYOUT_ROUTE134", + "name": "Route134_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route134/border.bin", + "blockdata_filepath": "data/layouts/Route134/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER2", + "name": "Underwater2_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater2/border.bin", + "blockdata_filepath": "data/layouts/Underwater2/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER3", + "name": "Underwater3_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater3/border.bin", + "blockdata_filepath": "data/layouts/Underwater3/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER4", + "name": "Underwater4_Layout", + "width": 120, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater4/border.bin", + "blockdata_filepath": "data/layouts/Underwater4/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "name": "LittlerootTown_BrendansHouse_1F_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "name": "LittlerootTown_BrendansHouse_2F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "name": "LittlerootTown_MaysHouse_1F_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "name": "LittlerootTown_MaysHouse_2F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "name": "LittlerootTown_ProfessorBirchsLab_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" + }, + { + "id": "LAYOUT_HOUSE1", + "name": "House1_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House1/border.bin", + "blockdata_filepath": "data/layouts/House1/map.bin" + }, + { + "id": "LAYOUT_HOUSE2", + "name": "House2_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House2/border.bin", + "blockdata_filepath": "data/layouts/House2/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_1F", + "name": "PokemonCenter_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_2F", + "name": "PokemonCenter_2F_Layout", + "width": 14, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/PokemonCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin" + }, + { + "id": "LAYOUT_MART", + "name": "Mart_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Mart/border.bin", + "blockdata_filepath": "data/layouts/Mart/map.bin" + }, + { + "id": "LAYOUT_HOUSE3", + "name": "House3_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House3/border.bin", + "blockdata_filepath": "data/layouts/House3/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN_GYM", + "name": "DewfordTown_Gym_Layout", + "width": 18, + "height": 28, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DewfordGym", + "border_filepath": "data/layouts/DewfordTown_Gym/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown_Gym/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN_HALL", + "name": "DewfordTown_Hall_Layout", + "width": 17, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/DewfordTown_Hall/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown_Hall/map.bin" + }, + { + "id": "LAYOUT_HOUSE4", + "name": "House4_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House4/border.bin", + "blockdata_filepath": "data/layouts/House4/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", + "name": "LavaridgeTown_HerbShop_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", + "name": "LavaridgeTown_Gym_1F_Layout", + "width": 17, + "height": 19, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LavaridgeGym", + "border_filepath": "data/layouts/LavaridgeTown_Gym_1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_1F/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", + "name": "LavaridgeTown_Gym_B1F_Layout", + "width": 17, + "height": 19, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LavaridgeGym", + "border_filepath": "data/layouts/LavaridgeTown_Gym_B1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_B1F/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "name": "LavaridgeTown_PokemonCenter_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY", + "name": "FallarborTown_LeftoverRSContestLobby_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL", + "name": "FallarborTown_LeftoverRSContestHall_Layout", + "width": 21, + "height": 18, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_HOUSE2", + "name": "LilycoveCity_House2_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_House2/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08428450", + "name": "UnknownMap_08428450_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_08428450/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", + "name": "VerdanturfTown_WandasHouse_Layout", + "width": 17, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/VerdanturfTown_WandasHouse/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown_WandasHouse/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "name": "PacifidlogTown_House1_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "name": "PacifidlogTown_House2_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin" + }, + { + "id": "LAYOUT_PETALBURG_CITY_GYM", + "name": "PetalburgCity_Gym_Layout", + "width": 9, + "height": 112, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PetalburgGym", + "border_filepath": "data/layouts/PetalburgCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/PetalburgCity_Gym/map.bin" + }, + { + "id": "LAYOUT_HOUSE_WITH_BED", + "name": "HouseWithBed_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/HouseWithBed/border.bin", + "blockdata_filepath": "data/layouts/HouseWithBed/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "name": "SlateportCity_SternsShipyard_1F_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "name": "SlateportCity_SternsShipyard_2F_Layout", + "width": 17, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084294C4", + "name": "UnknownMap_084294C4_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084294E8", + "name": "UnknownMap_084294E8_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "name": "SlateportCity_PokemonFanClub_Layout", + "width": 14, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonFanClub", + "border_filepath": "data/layouts/SlateportCity_PokemonFanClub/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_PokemonFanClub/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "name": "SlateportCity_OceanicMuseum_1F_Layout", + "width": 20, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_OceanicMuseum", + "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "name": "SlateportCity_OceanicMuseum_2F_Layout", + "width": 20, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_OceanicMuseum", + "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" + }, + { + "id": "LAYOUT_HARBOR", + "name": "Harbor_Layout", + "width": 24, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/Harbor/border.bin", + "blockdata_filepath": "data/layouts/Harbor/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_GYM", + "name": "MauvilleCity_Gym_Layout", + "width": 10, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MauvilleGym", + "border_filepath": "data/layouts/MauvilleCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_Gym/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", + "name": "MauvilleCity_BikeShop_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BikeShop", + "border_filepath": "data/layouts/MauvilleCity_BikeShop/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_BikeShop/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", + "name": "MauvilleCity_GameCorner_Layout", + "width": 22, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MauvilleGameCorner", + "border_filepath": "data/layouts/MauvilleCity_GameCorner/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_GameCorner/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", + "name": "RustboroCity_DevonCorp_1F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", + "name": "RustboroCity_DevonCorp_2F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_2F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_GYM", + "name": "RustboroCity_Gym_Layout", + "width": 11, + "height": 20, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_RustboroGym", + "border_filepath": "data/layouts/RustboroCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Gym/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", + "name": "RustboroCity_PokemonSchool_Layout", + "width": 12, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonSchool", + "border_filepath": "data/layouts/RustboroCity_PokemonSchool/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_PokemonSchool/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_HOUSE", + "name": "RustboroCity_House_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_House/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_House/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_HOUSE1", + "name": "RustboroCity_House1_Layout", + "width": 13, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_House1/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_House1/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", + "name": "RustboroCity_CuttersHouse_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_HOUSE1", + "name": "FortreeCity_House1_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_House1/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_GYM", + "name": "FortreeCity_Gym_Layout", + "width": 20, + "height": 25, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FortreeGym", + "border_filepath": "data/layouts/FortreeCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_Gym/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_HOUSE2", + "name": "FortreeCity_House2_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_House2/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", + "name": "Route104_MrBrineysHouse_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route104_MrBrineysHouse/border.bin", + "blockdata_filepath": "data/layouts/Route104_MrBrineysHouse/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "name": "LilycoveCity_LilycoveMuseum_1F_Layout", + "width": 21, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LilycoveMuseum", + "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "name": "LilycoveCity_LilycoveMuseum_2F_Layout", + "width": 22, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LilycoveMuseum", + "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", + "name": "LilycoveCity_ContestLobby_Layout", + "width": 31, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LilycoveCity_ContestLobby/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_ContestLobby/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", + "name": "LilycoveCity_ContestHall_Layout", + "width": 51, + "height": 33, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LilycoveCity_ContestHall/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_ContestHall/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "LilycoveCity_PokemonTrainerFanClub_Layout", + "width": 12, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GYM", + "name": "MossdeepCity_Gym_Layout", + "width": 26, + "height": 36, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MossdeepGym", + "border_filepath": "data/layouts/MossdeepCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_Gym/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", + "name": "SootopolisCity_Gym_1F_Layout", + "width": 17, + "height": 26, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SootopolisGym", + "border_filepath": "data/layouts/SootopolisCity_Gym_1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_Gym_1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", + "name": "SootopolisCity_Gym_B1F_Layout", + "width": 17, + "height": 26, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SootopolisGym", + "border_filepath": "data/layouts/SootopolisCity_Gym_B1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_Gym_B1F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "name": "EverGrandeCity_SidneysRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_SidneysRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_SidneysRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", + "name": "EverGrandeCity_PhoebesRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", + "name": "EverGrandeCity_GlaciasRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", + "name": "EverGrandeCity_DrakesRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_DrakesRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_DrakesRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "name": "EverGrandeCity_ChampionsRoom_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "name": "EverGrandeCity_ShortHall_Layout", + "width": 11, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_ShortHall/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_ShortHall/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrettyPetalFlowerShop_Layout", + "width": 15, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PrettyPetalFlowerShop", + "border_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/border.bin", + "blockdata_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" + }, + { + "id": "LAYOUT_CABLE_CAR_STATION", + "name": "CableCarStation_Layout", + "width": 13, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/CableCarStation/border.bin", + "blockdata_filepath": "data/layouts/CableCarStation/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", + "name": "Route114_FossilManiacsHouse_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route114_FossilManiacsHouse/border.bin", + "blockdata_filepath": "data/layouts/Route114_FossilManiacsHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "name": "Route114_FossilManiacsTunnel_Layout", + "width": 13, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route114_FossilManiacsTunnel/border.bin", + "blockdata_filepath": "data/layouts/Route114_FossilManiacsTunnel/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_LANETTES_HOUSE", + "name": "Route114_LanettesHouse_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route114_LanettesHouse/border.bin", + "blockdata_filepath": "data/layouts/Route114_LanettesHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", + "name": "Route116_TunnelersRestHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route116_TunnelersRestHouse/border.bin", + "blockdata_filepath": "data/layouts/Route116_TunnelersRestHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", + "name": "Route117_PokemonDayCare_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonDayCare", + "border_filepath": "data/layouts/Route117_PokemonDayCare/border.bin", + "blockdata_filepath": "data/layouts/Route117_PokemonDayCare/map.bin" + }, + { + "id": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", + "name": "Route121_SafariZoneEntrance_Layout", + "width": 18, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Route121_SafariZoneEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route121_SafariZoneEntrance/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_1F_1R", + "name": "MeteorFalls_1F_1R_Layout", + "width": 30, + "height": 42, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_1F_1R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_1F_1R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_1F_2R", + "name": "MeteorFalls_1F_2R_Layout", + "width": 30, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_1F_2R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_1F_2R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_B1F_1R", + "name": "MeteorFalls_B1F_1R_Layout", + "width": 29, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_B1F_1R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_B1F_1R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_B1F_2R", + "name": "MeteorFalls_B1F_2R_Layout", + "width": 11, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_B1F_2R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_B1F_2R/map.bin" + }, + { + "id": "LAYOUT_RUSTURF_TUNNEL", + "name": "RusturfTunnel_Layout", + "width": 36, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_RusturfTunnel", + "border_filepath": "data/layouts/RusturfTunnel/border.bin", + "blockdata_filepath": "data/layouts/RusturfTunnel/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", + "name": "Underwater_SootopolisCity_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SootopolisCity/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SootopolisCity/map.bin" + }, + { + "id": "LAYOUT_DESERT_RUINS", + "name": "DesertRuins_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/DesertRuins/border.bin", + "blockdata_filepath": "data/layouts/DesertRuins/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_1F", + "name": "GraniteCave_1F_Layout", + "width": 42, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_1F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_1F/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_B1F", + "name": "GraniteCave_B1F_Layout", + "width": 32, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_B1F/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_B2F", + "name": "GraniteCave_B2F_Layout", + "width": 32, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_B2F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_B2F/map.bin" + }, + { + "id": "LAYOUT_PETALBURG_WOODS", + "name": "PetalburgWoods_Layout", + "width": 48, + "height": 44, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/PetalburgWoods/border.bin", + "blockdata_filepath": "data/layouts/PetalburgWoods/map.bin" + }, + { + "id": "LAYOUT_MT_CHIMNEY", + "name": "MtChimney_Layout", + "width": 40, + "height": 47, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MtChimney/border.bin", + "blockdata_filepath": "data/layouts/MtChimney/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_1F", + "name": "MtPyre_1F_Layout", + "width": 22, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_1F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_1F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_2F", + "name": "MtPyre_2F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_2F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_2F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_3F", + "name": "MtPyre_3F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_3F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_3F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_4F", + "name": "MtPyre_4F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_4F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_4F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_5F", + "name": "MtPyre_5F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_5F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_5F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_6F", + "name": "MtPyre_6F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_6F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_6F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_1F", + "name": "AquaHideout_1F_Layout", + "width": 28, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_1F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_1F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_B1F", + "name": "AquaHideout_B1F_Layout", + "width": 51, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_B1F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_B1F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_B2F", + "name": "AquaHideout_B2F_Layout", + "width": 34, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_B2F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_B2F/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", + "name": "Underwater_SeafloorCavern_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SeafloorCavern/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SeafloorCavern/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", + "name": "SeafloorCavern_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Entrance/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Entrance/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", + "name": "SeafloorCavern_Room1_Layout", + "width": 20, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room1/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room1/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", + "name": "SeafloorCavern_Room2_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room2/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room2/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", + "name": "SeafloorCavern_Room3_Layout", + "width": 16, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room3/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room3/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", + "name": "SeafloorCavern_Room4_Layout", + "width": 18, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room4/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room4/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", + "name": "SeafloorCavern_Room5_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room5/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room5/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", + "name": "SeafloorCavern_Room6_Layout", + "width": 24, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SeafloorCavern_Room6/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room6/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", + "name": "SeafloorCavern_Room7_Layout", + "width": 23, + "height": 25, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SeafloorCavern_Room7/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room7/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", + "name": "SeafloorCavern_Room8_Layout", + "width": 11, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room8/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room8/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", + "name": "SeafloorCavern_Room9_Layout", + "width": 27, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room9/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room9/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", + "name": "CaveOfOrigin_Entrance_Layout", + "width": 19, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_Entrance/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_Entrance/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_1F", + "name": "CaveOfOrigin_1F_Layout", + "width": 23, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_1F/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_1F/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "name": "CaveOfOrigin_UnusedRubySapphireMap1_Layout", + "width": 23, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "name": "CaveOfOrigin_UnusedRubySapphireMap2_Layout", + "width": 21, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "name": "CaveOfOrigin_UnusedRubySapphireMap3_Layout", + "width": 19, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_B1F", + "name": "CaveOfOrigin_B1F_Layout", + "width": 19, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_B1F/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_B1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F_Layout", + "width": 46, + "height": 45, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_1F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_LowTideEntranceRoom_Layout", + "width": 35, + "height": 35, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "name": "ShoalCave_LowTideInnerRoom_Layout", + "width": 46, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "name": "ShoalCave_LowTideStairsRoom_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "name": "ShoalCave_LowTideLowerRoom_Layout", + "width": 31, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_HighTideEntranceRoom_Layout", + "width": 35, + "height": 35, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "name": "ShoalCave_HighTideInnerRoom_Layout", + "width": 46, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E6C0", + "name": "UnknownMap_0843E6C0_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E6E4", + "name": "UnknownMap_0843E6E4_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E708", + "name": "UnknownMap_0843E708_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E72C", + "name": "UnknownMap_0843E72C_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E750", + "name": "UnknownMap_0843E750_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E774", + "name": "UnknownMap_0843E774_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E798", + "name": "UnknownMap_0843E798_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E7BC", + "name": "UnknownMap_0843E7BC_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E7E0", + "name": "UnknownMap_0843E7E0_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E804", + "name": "UnknownMap_0843E804_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E828", + "name": "UnknownMap_0843E828_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E84C", + "name": "UnknownMap_0843E84C_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E870", + "name": "UnknownMap_0843E870_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E894", + "name": "UnknownMap_0843E894_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.bin" + }, + { + "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE", + "name": "NewMauville_Entrance_Layout", + "width": 9, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/NewMauville_Entrance/border.bin", + "blockdata_filepath": "data/layouts/NewMauville_Entrance/map.bin" + }, + { + "id": "LAYOUT_NEW_MAUVILLE_INSIDE", + "name": "NewMauville_Inside_Layout", + "width": 41, + "height": 41, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BikeShop", + "border_filepath": "data/layouts/NewMauville_Inside/border.bin", + "blockdata_filepath": "data/layouts/NewMauville_Inside/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_DECK", + "name": "AbandonedShip_Deck_Layout", + "width": 23, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AbandonedShip_Deck/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Deck/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", + "name": "AbandonedShip_Corridors_1F_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Corridors_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", + "name": "AbandonedShip_Rooms_1F_Layout", + "width": 18, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", + "name": "AbandonedShip_Corridors_B1F_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Corridors_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", + "name": "AbandonedShip_Rooms_B1F_Layout", + "width": 27, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", + "name": "AbandonedShip_Rooms2_B1F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", + "name": "AbandonedShip_Underwater1_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Underwater1/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Underwater1/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", + "name": "AbandonedShip_Room_B1F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Room_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Room_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", + "name": "AbandonedShip_Rooms2_1F_Layout", + "width": 9, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms2_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", + "name": "AbandonedShip_CaptainsOffice_Layout", + "width": 9, + "height": 7, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AbandonedShip_CaptainsOffice/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_CaptainsOffice/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", + "name": "AbandonedShip_Underwater2_Layout", + "width": 21, + "height": 7, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Underwater2/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Underwater2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE1", + "name": "SecretBase_RedCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE1", + "name": "SecretBase_BrownCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE1", + "name": "SecretBase_BlueCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", + "name": "SecretBase_YellowCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE1", + "name": "SecretBase_Tree1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB1", + "name": "SecretBase_Shrub1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE2", + "name": "SecretBase_RedCave2_Layout", + "width": 7, + "height": 16, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE2", + "name": "SecretBase_BrownCave2_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE2", + "name": "SecretBase_BlueCave2_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", + "name": "SecretBase_YellowCave2_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE2", + "name": "SecretBase_Tree2_Layout", + "width": 7, + "height": 16, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB2", + "name": "SecretBase_Shrub2_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE3", + "name": "SecretBase_RedCave3_Layout", + "width": 15, + "height": 8, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE3", + "name": "SecretBase_BrownCave3_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE3", + "name": "SecretBase_BlueCave3_Layout", + "width": 10, + "height": 17, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", + "name": "SecretBase_YellowCave3_Layout", + "width": 12, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE3", + "name": "SecretBase_Tree3_Layout", + "width": 17, + "height": 8, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB3", + "name": "SecretBase_Shrub3_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE4", + "name": "SecretBase_RedCave4_Layout", + "width": 9, + "height": 15, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE4", + "name": "SecretBase_BrownCave4_Layout", + "width": 14, + "height": 12, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE4", + "name": "SecretBase_BlueCave4_Layout", + "width": 9, + "height": 17, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", + "name": "SecretBase_YellowCave4_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE4", + "name": "SecretBase_Tree4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB4", + "name": "SecretBase_Shrub4_Layout", + "width": 14, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin" + }, + { + "id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", + "name": "SingleBattleColosseum_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/SingleBattleColosseum/border.bin", + "blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin" + }, + { + "id": "LAYOUT_TRADE_CENTER", + "name": "TradeCenter_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/TradeCenter/border.bin", + "blockdata_filepath": "data/layouts/TradeCenter/map.bin" + }, + { + "id": "LAYOUT_RECORD_CORNER", + "name": "RecordCorner_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/RecordCorner/border.bin", + "blockdata_filepath": "data/layouts/RecordCorner/map.bin" + }, + { + "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", + "name": "DoubleBattleColosseum_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/DoubleBattleColosseum/border.bin", + "blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM1", + "name": "LinkContestRoom1_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom1/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_29", + "name": "UnknownMap_25_29_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_29/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_30", + "name": "UnknownMap_25_30_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_30/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_31", + "name": "UnknownMap_25_31_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_31/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_32", + "name": "UnknownMap_25_32_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_32/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_33", + "name": "UnknownMap_25_33_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_33/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_34", + "name": "UnknownMap_25_34_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_34/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM2", + "name": "LinkContestRoom2_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom2/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM3", + "name": "LinkContestRoom3_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom3/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM4", + "name": "LinkContestRoom4_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom4/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM5", + "name": "LinkContestRoom5_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom5/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM6", + "name": "LinkContestRoom6_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom6/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin" + }, + { + "id": "LAYOUT_INSIDE_OF_TRUCK", + "name": "InsideOfTruck_Layout", + "width": 5, + "height": 5, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideOfTruck", + "border_filepath": "data/layouts/InsideOfTruck/border.bin", + "blockdata_filepath": "data/layouts/InsideOfTruck/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTHWEST", + "name": "SafariZone_Northwest_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Northwest/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Northwest/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTH", + "name": "SafariZone_North_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_North/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_North/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTHWEST", + "name": "SafariZone_Southwest_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Southwest/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Southwest/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTH", + "name": "SafariZone_South_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_South/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_South/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08447028", + "name": "UnknownMap_08447028_Layout", + "width": 58, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "0", + "border_filepath": "data/layouts/UnknownMap_08447028/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.bin" + }, + { + "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE", + "name": "Route109_SeashoreHouse_Layout", + "width": 15, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SeashoreHouse", + "border_filepath": "data/layouts/Route109_SeashoreHouse/border.bin", + "blockdata_filepath": "data/layouts/Route109_SeashoreHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", + "name": "Route110_TrickHouseEntrance_Layout", + "width": 12, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseEntrance/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_END", + "name": "Route110_TrickHouseEnd_Layout", + "width": 12, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseEnd/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseEnd/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", + "name": "Route110_TrickHouseCorridor_Layout", + "width": 15, + "height": 24, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseCorridor/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseCorridor/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", + "name": "Route110_TrickHousePuzzle1_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle1/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle1/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", + "name": "Route110_TrickHousePuzzle2_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle2/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle2/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", + "name": "Route110_TrickHousePuzzle3_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle3/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle3/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", + "name": "Route110_TrickHousePuzzle4_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle4/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle4/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", + "name": "Route110_TrickHousePuzzle5_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle5/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle5/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", + "name": "Route110_TrickHousePuzzle6_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle6/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle6/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", + "name": "Route110_TrickHousePuzzle7_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle7/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle7/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", + "name": "Route110_TrickHousePuzzle8_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle8/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle8/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", + "name": "FortreeCity_DecorationShop_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "name": "Route110_SeasideCyclingRoadEntrance_Layout", + "width": 15, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "name": "LilycoveCity_DepartmentStore_1F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "name": "LilycoveCity_DepartmentStore_2F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "name": "LilycoveCity_DepartmentStore_3F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "name": "LilycoveCity_DepartmentStore_4F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "name": "LilycoveCity_DepartmentStore_5F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "name": "LilycoveCity_DepartmentStoreRooftop_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" + }, + { + "id": "LAYOUT_ROUTE130", + "name": "Route130_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/Route130/border.bin", + "blockdata_filepath": "data/layouts/Route130/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "name": "BattleFrontier_BattleTowerLobby_Layout", + "width": 25, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST", + "name": "BattleFrontier_OutsideWest_Layout", + "width": 56, + "height": 72, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontierOutsideWest", + "border_filepath": "data/layouts/BattleFrontier_OutsideWest/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_OutsideWest/map.bin" + }, + { + "id": "LAYOUT_BATTLE_ELEVATOR", + "name": "BattleElevator_Layout", + "width": 5, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleElevator/border.bin", + "blockdata_filepath": "data/layouts/BattleElevator/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "name": "BattleFrontier_BattleTowerCorridor_Layout", + "width": 17, + "height": 5, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerBattleRoom_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", + "name": "RustboroCity_DevonCorp_3F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_3F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_3F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "name": "EverGrandeCity_PokemonLeague_1F_Layout", + "width": 19, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" + }, + { + "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", + "name": "Route119_WeatherInstitute_1F_Layout", + "width": 20, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route119_WeatherInstitute_1F/border.bin", + "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_1F/map.bin" + }, + { + "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", + "name": "Route119_WeatherInstitute_2F_Layout", + "width": 20, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route119_WeatherInstitute_2F/border.bin", + "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "LilycoveCity_DepartmentStoreElevator_Layout", + "width": 5, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER1", + "name": "Underwater1_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater1/border.bin", + "blockdata_filepath": "data/layouts/Underwater1/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", + "name": "MossdeepCity_SpaceCenter_1F_Layout", + "width": 16, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", + "name": "MossdeepCity_SpaceCenter_2F_Layout", + "width": 16, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_CORRIDOR", + "name": "SSTidalCorridor_Layout", + "width": 18, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalCorridor/border.bin", + "blockdata_filepath": "data/layouts/SSTidalCorridor/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_LOWER_DECK", + "name": "SSTidalLowerDeck_Layout", + "width": 17, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalLowerDeck/border.bin", + "blockdata_filepath": "data/layouts/SSTidalLowerDeck/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_ROOMS", + "name": "SSTidalRooms_Layout", + "width": 36, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalRooms/border.bin", + "blockdata_filepath": "data/layouts/SSTidalRooms/map.bin" + }, + { + "id": "LAYOUT_ISLAND_CAVE", + "name": "IslandCave_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/IslandCave/border.bin", + "blockdata_filepath": "data/layouts/IslandCave/map.bin" + }, + { + "id": "LAYOUT_ANCIENT_TOMB", + "name": "AncientTomb_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/AncientTomb/border.bin", + "blockdata_filepath": "data/layouts/AncientTomb/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_ROUTE134", + "name": "Underwater_Route134_Layout", + "width": 18, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_Route134/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route134/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SEALED_CHAMBER", + "name": "Underwater_SealedChamber_Layout", + "width": 22, + "height": 48, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SealedChamber/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SealedChamber/map.bin" + }, + { + "id": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", + "name": "SealedChamber_OuterRoom_Layout", + "width": 21, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SealedChamber_OuterRoom/border.bin", + "blockdata_filepath": "data/layouts/SealedChamber_OuterRoom/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_B1F", + "name": "VictoryRoad_B1F_Layout", + "width": 46, + "height": 31, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_B1F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_B1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_B2F", + "name": "VictoryRoad_B2F_Layout", + "width": 46, + "height": 31, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_B2F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_B2F/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_PROTOTYPE", + "name": "Route104_Prototype_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route104_Prototype/border.bin", + "blockdata_filepath": "data/layouts/Route104_Prototype/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", + "name": "GraniteCave_StevensRoom_Layout", + "width": 15, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_StevensRoom/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_StevensRoom/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "name": "AbandonedShip_HiddenFloorCorridors_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" + }, + { + "id": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", + "name": "SouthernIsland_Exterior_Layout", + "width": 33, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/SouthernIsland_Exterior/border.bin", + "blockdata_filepath": "data/layouts/SouthernIsland_Exterior/map.bin" + }, + { + "id": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", + "name": "SouthernIsland_Interior_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/SouthernIsland_Interior/border.bin", + "blockdata_filepath": "data/layouts/SouthernIsland_Interior/map.bin" + }, + { + "id": "LAYOUT_JAGGED_PASS", + "name": "JaggedPass_Layout", + "width": 30, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/JaggedPass/border.bin", + "blockdata_filepath": "data/layouts/JaggedPass/map.bin" + }, + { + "id": "LAYOUT_FIERY_PATH", + "name": "FieryPath_Layout", + "width": 35, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/FieryPath/border.bin", + "blockdata_filepath": "data/layouts/FieryPath/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", + "name": "RustboroCity_Flat2_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", + "name": "RustboroCity_Flat2_2F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", + "name": "RustboroCity_Flat2_3F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "name": "SootopolisCity_LotadAndSeedotHouse_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", + "name": "EverGrandeCity_HallOfFame_Layout", + "width": 15, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "name": "LilycoveCity_CoveLilyMotel_1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "name": "LilycoveCity_CoveLilyMotel_2F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" + }, + { + "id": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "name": "Route124_DivingTreasureHuntersHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin", + "blockdata_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_EXTERIOR", + "name": "MtPyre_Exterior_Layout", + "width": 38, + "height": 51, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_Exterior/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_Exterior/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_SUMMIT", + "name": "MtPyre_Summit_Layout", + "width": 50, + "height": 37, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_Summit/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_Summit/map.bin" + }, + { + "id": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", + "name": "SealedChamber_InnerRoom_Layout", + "width": 21, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SealedChamber_InnerRoom/border.bin", + "blockdata_filepath": "data/layouts/SealedChamber_InnerRoom/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", + "name": "MossdeepCity_GameCorner_1F_Layout", + "width": 12, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MossdeepGameCorner", + "border_filepath": "data/layouts/MossdeepCity_GameCorner_1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_1F/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", + "name": "MossdeepCity_GameCorner_B1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "name": "SootopolisCity_House1_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House1/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "name": "SootopolisCity_House2_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House2/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "name": "SootopolisCity_House3_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House3/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "name": "AbandonedShip_HiddenFloorRooms_Layout", + "width": 44, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" + }, + { + "id": "LAYOUT_SCORCHED_SLAB", + "name": "ScorchedSlab_Layout", + "width": 15, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ScorchedSlab/border.bin", + "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845A394", + "name": "UnknownMap_0845A394_Layout", + "width": 19, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", + "name": "RustboroCity_Flat1_1F_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", + "name": "RustboroCity_Flat1_2F_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_HALL4", + "name": "EverGrandeCity_Hall4_Layout", + "width": 11, + "height": 34, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_Hall4/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_Hall4/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "name": "AquaHideout_UnusedRubyMap1_Layout", + "width": 28, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "name": "AquaHideout_UnusedRubyMap2_Layout", + "width": 62, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "name": "AquaHideout_UnusedRubyMap3_Layout", + "width": 34, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845D470", + "name": "UnknownMap_0845D470_Layout", + "width": 60, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_ENTRANCE", + "name": "SkyPillar_Entrance_Layout", + "width": 18, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SkyPillar_Entrance/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Entrance/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_OUTSIDE", + "name": "SkyPillar_Outside_Layout", + "width": 28, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_Outside/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Outside/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_1F", + "name": "SkyPillar_1F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_1F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_1F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_2F", + "name": "SkyPillar_2F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_2F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_2F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_3F", + "name": "SkyPillar_3F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_3F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_3F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_4F", + "name": "SkyPillar_4F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_4F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845ECB4", + "name": "UnknownMap_0845ECB4_Layout", + "width": 27, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", + "name": "MossdeepCity_StevensHouse_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/MossdeepCity_StevensHouse/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_StevensHouse/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "name": "ShoalCave_LowTideIceRoom_Layout", + "width": 20, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideIceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideIceRoom/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_REST_HOUSE", + "name": "SafariZone_RestHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_5F", + "name": "SkyPillar_5F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_5F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_5F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_TOP", + "name": "SkyPillar_Top_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_Top/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Top/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "name": "BattleFrontier_BattleDomeLobby_Layout", + "width": 23, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "name": "BattleFrontier_BattleDomeCorridor_Layout", + "width": 48, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomePreBattleRoom_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomeBattleRoom_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_1F", + "name": "MagmaHideout_1F_Layout", + "width": 37, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_1F/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_1F/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_1R", + "name": "MagmaHideout_2F_1R_Layout", + "width": 33, + "height": 39, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_1R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_1R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_2R", + "name": "MagmaHideout_2F_2R_Layout", + "width": 49, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_2R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_2R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_1R", + "name": "MagmaHideout_3F_1R_Layout", + "width": 28, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_1R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_1R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_2R", + "name": "MagmaHideout_3F_2R_Layout", + "width": 24, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_2R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_2R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_4F", + "name": "MagmaHideout_4F_Layout", + "width": 59, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_4F/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_4F/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "name": "BattleFrontier_BattlePalaceLobby_Layout", + "width": 25, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "name": "BattleFrontier_BattlePalaceCorridor_Layout", + "width": 17, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "name": "BattleFrontier_BattlePalaceBattleRoom_Layout", + "width": 15, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST", + "name": "BattleFrontier_OutsideEast_Layout", + "width": 72, + "height": 72, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontierOutsideEast", + "border_filepath": "data/layouts/BattleFrontier_OutsideEast/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_OutsideEast/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "name": "BattleFrontier_BattleFactoryLobby_Layout", + "width": 19, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryPreBattleRoom_Layout", + "width": 17, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryBattleRoom_Layout", + "width": 13, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "name": "BattleFrontier_BattlePikeLobby_Layout", + "width": 11, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "name": "BattleFrontier_BattlePikeCorridor_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "name": "BattleFrontier_BattlePikeThreePathRoom_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "name": "BattleFrontier_BattlePikeRandomRoom1_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2_Layout", + "width": 5, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "name": "BattleFrontier_BattleArenaLobby_Layout", + "width": 16, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "name": "BattleFrontier_BattleArenaCorridor_Layout", + "width": 18, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "name": "BattleFrontier_BattleArenaBattleRoom_Layout", + "width": 16, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08469200", + "name": "UnknownMap_08469200_Layout", + "width": 60, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Sootopolis", + "border_filepath": "data/layouts/UnknownMap_08469200/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "name": "BattleFrontier_BattlePikeRandomRoom3_Layout", + "width": 9, + "height": 20, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084693AC", + "name": "UnknownMap_084693AC_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "name": "BattleFrontier_BattlePyramidLobby_Layout", + "width": 15, + "height": 18, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "name": "BattleFrontier_BattlePyramidEmptySquare_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01", + "name": "BattlePyramidSquare01_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare01/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare01/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE02", + "name": "BattlePyramidSquare02_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare02/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare02/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE03", + "name": "BattlePyramidSquare03_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare03/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare03/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE04", + "name": "BattlePyramidSquare04_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare04/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare04/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE05", + "name": "BattlePyramidSquare05_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare05/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare05/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE06", + "name": "BattlePyramidSquare06_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare06/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare06/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE07", + "name": "BattlePyramidSquare07_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare07/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare07/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE08", + "name": "BattlePyramidSquare08_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare08/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare08/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE09", + "name": "BattlePyramidSquare09_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare09/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare09/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE10", + "name": "BattlePyramidSquare10_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare10/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare10/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE11", + "name": "BattlePyramidSquare11_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare11/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare11/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE12", + "name": "BattlePyramidSquare12_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare12/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare12/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE13", + "name": "BattlePyramidSquare13_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare13/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare13/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE14", + "name": "BattlePyramidSquare14_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare14/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare14/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE15", + "name": "BattlePyramidSquare15_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare15/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare15/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE16", + "name": "BattlePyramidSquare16_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare16/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare16/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "name": "BattleFrontier_BattlePyramidTop_Layout", + "width": 34, + "height": 23, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_3R", + "name": "MagmaHideout_3F_3R_Layout", + "width": 33, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_3R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_3R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_3R", + "name": "MagmaHideout_2F_3R_Layout", + "width": 60, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_3R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_3R/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_1F", + "name": "MirageTower_1F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_1F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_1F/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_2F", + "name": "MirageTower_2F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_2F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_2F/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_3F", + "name": "MirageTower_3F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_3F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_3F/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_LOBBY", + "name": "BattleTentLobby_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleTentLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_CORRIDOR", + "name": "BattleTentCorridor_Layout", + "width": 5, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleTentCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "name": "BattleTentBattleRoom_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleTentBattleRoom/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "VerdanturfTown_BattleTentBattleRoom_Layout", + "width": 13, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_4F", + "name": "MirageTower_4F_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_4F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_4F/map.bin" + }, + { + "id": "LAYOUT_DESERT_UNDERPASS", + "name": "DesertUnderpass_Layout", + "width": 139, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/DesertUnderpass/border.bin", + "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "name": "BattleFrontier_BattleTowerCorridor2_Layout", + "width": 17, + "height": 5, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" + }, + { + "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER", + "name": "Route111_NoMirageTower_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route111_NoMirageTower/border.bin", + "blockdata_filepath": "data/layouts/Route111_NoMirageTower/map.bin" + }, + { + "id": "LAYOUT_UNION_ROOM", + "name": "UnionRoom_Layout", + "width": 15, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_UnionRoom", + "border_filepath": "data/layouts/UnionRoom/border.bin", + "blockdata_filepath": "data/layouts/UnionRoom/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTHEAST", + "name": "SafariZone_Northeast_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Northeast/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Northeast/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTHEAST", + "name": "SafariZone_Southeast_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Southeast/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Southeast/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", + "name": "BattleFrontier_RankingHall_Layout", + "width": 53, + "height": 15, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontierRankingHall", + "border_filepath": "data/layouts/BattleFrontier_RankingHall/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_RankingHall/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "name": "BattleFrontier_Lounge1_Layout", + "width": 13, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_Lounge1/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_Lounge1/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "name": "BattleFrontier_BattlePointExchangeServiceCorner_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", + "name": "BattleFrontier_ReceptionGate_Layout", + "width": 9, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_ReceptionGate/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_ReceptionGate/map.bin" + }, + { + "id": "LAYOUT_ARTISAN_CAVE_B1F", + "name": "ArtisanCave_B1F_Layout", + "width": 46, + "height": 54, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ArtisanCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/ArtisanCave_B1F/map.bin" + }, + { + "id": "LAYOUT_ARTISAN_CAVE_1F", + "name": "ArtisanCave_1F_Layout", + "width": 21, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ArtisanCave_1F/border.bin", + "blockdata_filepath": "data/layouts/ArtisanCave_1F/map.bin" + }, + { + "id": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", + "name": "FarawayIsland_Entrance_Layout", + "width": 34, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/FarawayIsland_Entrance/border.bin", + "blockdata_filepath": "data/layouts/FarawayIsland_Entrance/map.bin" + }, + { + "id": "LAYOUT_FARAWAY_ISLAND_INTERIOR", + "name": "FarawayIsland_Interior_Layout", + "width": 29, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/FarawayIsland_Interior/border.bin", + "blockdata_filepath": "data/layouts/FarawayIsland_Interior/map.bin" + }, + { + "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior_Layout", + "width": 30, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin", + "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin" + }, + { + "id": "LAYOUT_ISLAND_HARBOR", + "name": "IslandHarbor_Layout", + "width": 17, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_IslandHarbor", + "border_filepath": "data/layouts/IslandHarbor/border.bin", + "blockdata_filepath": "data/layouts/IslandHarbor/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_MARINE_CAVE", + "name": "Underwater_MarineCave_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_MarineCave/border.bin", + "blockdata_filepath": "data/layouts/Underwater_MarineCave/map.bin" + }, + { + "id": "LAYOUT_MARINE_CAVE_ENTRANCE", + "name": "MarineCave_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/MarineCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/MarineCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_TERRA_CAVE_ENTRANCE", + "name": "TerraCave_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/TerraCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/TerraCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_TERRA_CAVE_END", + "name": "TerraCave_End_Layout", + "width": 27, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/TerraCave_End/border.bin", + "blockdata_filepath": "data/layouts/TerraCave_End/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER6", + "name": "Underwater6_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater6/border.bin", + "blockdata_filepath": "data/layouts/Underwater6/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER7", + "name": "Underwater7_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater7/border.bin", + "blockdata_filepath": "data/layouts/Underwater7/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER5", + "name": "Underwater5_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater5/border.bin", + "blockdata_filepath": "data/layouts/Underwater5/map.bin" + }, + { + "id": "LAYOUT_MARINE_CAVE_END", + "name": "MarineCave_End_Layout", + "width": 27, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/MarineCave_End/border.bin", + "blockdata_filepath": "data/layouts/MarineCave_End/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_ENTRANCE", + "name": "TrainerHill_Entrance_Layout", + "width": 19, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_Entrance/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_Entrance/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_1F", + "name": "TrainerHill_1F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_1F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_1F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_2F", + "name": "TrainerHill_2F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_2F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_2F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_3F", + "name": "TrainerHill_3F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_3F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_3F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_4F", + "name": "TrainerHill_4F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_4F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_4F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_ROOF", + "name": "TrainerHill_Roof_Layout", + "width": 25, + "height": 16, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_Roof/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_Roof/map.bin" + }, + { + "id": "LAYOUT_ALTERING_CAVE", + "name": "AlteringCave_Layout", + "width": 32, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/AlteringCave/border.bin", + "blockdata_filepath": "data/layouts/AlteringCave/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior_Layout", + "width": 21, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/NavelRock_Exterior/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_ENTRANCE", + "name": "NavelRock_Entrance_Layout", + "width": 21, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Entrance/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Entrance/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_TOP", + "name": "NavelRock_Top_Layout", + "width": 25, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Top/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Top/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BOTTOM", + "name": "NavelRock_Bottom_Layout", + "width": 22, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Bottom/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Bottom/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "name": "NavelRock_LadderRoom1_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_LadderRoom1/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_LadderRoom1/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "name": "NavelRock_LadderRoom2_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_LadderRoom2/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_LadderRoom2/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F_Layout", + "width": 23, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_B1F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork_Layout", + "width": 27, + "height": 86, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Fork/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "name": "BattleFrontier_Lounge2_Layout", + "width": 9, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_Lounge2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_Lounge2/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", + "name": "BattleFrontier_ScottsHouse_Layout", + "width": 6, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_ScottsHouse/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_ScottsHouse/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", + "name": "MeteorFalls_StevensCave_Layout", + "width": 30, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_StevensCave/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08480DAC", + "name": "UnknownMap_08480DAC_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08480F54", + "name": "UnknownMap_08480F54_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084810FC", + "name": "UnknownMap_084810FC_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084812A4", + "name": "UnknownMap_084812A4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0848144C", + "name": "UnknownMap_0848144C_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084815F4", + "name": "UnknownMap_084815F4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08481B24", + "name": "UnknownMap_08481B24_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "name": "SootopolisCity_MysteryEventsHouse_1F_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "name": "SootopolisCity_MysteryEventsHouse_B1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08481DBC", + "name": "UnknownMap_08481DBC_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin" + } + ] +} \ No newline at end of file diff --git a/data/layouts_table.inc b/data/layouts_table.inc deleted file mode 100644 index fb1385bdb6..0000000000 --- a/data/layouts_table.inc +++ /dev/null @@ -1,443 +0,0 @@ - .align 2 -gMapLayouts:: - .4byte PetalburgCity_Layout - .4byte SlateportCity_Layout - .4byte MauvilleCity_Layout - .4byte RustboroCity_Layout - .4byte FortreeCity_Layout - .4byte LilycoveCity_Layout - .4byte MossdeepCity_Layout - .4byte SootopolisCity_Layout - .4byte EverGrandeCity_Layout - .4byte LittlerootTown_Layout - .4byte OldaleTown_Layout - .4byte DewfordTown_Layout - .4byte LavaridgeTown_Layout - .4byte FallarborTown_Layout - .4byte VerdanturfTown_Layout - .4byte PacifidlogTown_Layout - .4byte Route101_Layout - .4byte Route102_Layout - .4byte Route103_Layout - .4byte Route104_Layout - .4byte Route105_Layout - .4byte Route106_Layout - .4byte Route107_Layout - .4byte Route108_Layout - .4byte Route109_Layout - .4byte Route110_Layout - .4byte Route111_Layout - .4byte Route112_Layout - .4byte Route113_Layout - .4byte Route114_Layout - .4byte Route115_Layout - .4byte Route116_Layout - .4byte Route117_Layout - .4byte Route118_Layout - .4byte Route119_Layout - .4byte Route120_Layout - .4byte Route121_Layout - .4byte Route122_Layout - .4byte Route123_Layout - .4byte Route124_Layout - .4byte Route125_Layout - .4byte Route126_Layout - .4byte Route127_Layout - .4byte Route128_Layout - .4byte Route129_Layout - .4byte UnknownMap_08417FC4_Layout - .4byte Route131_Layout - .4byte Route132_Layout - .4byte Route133_Layout - .4byte Route134_Layout - .4byte Underwater2_Layout - .4byte Underwater3_Layout - .4byte Underwater4_Layout - .4byte LittlerootTown_BrendansHouse_1F_Layout - .4byte LittlerootTown_BrendansHouse_2F_Layout - .4byte LittlerootTown_MaysHouse_1F_Layout - .4byte LittlerootTown_MaysHouse_2F_Layout - .4byte LittlerootTown_ProfessorBirchsLab_Layout - .4byte House1_Layout - .4byte House2_Layout - .4byte PokemonCenter_1F_Layout - .4byte PokemonCenter_2F_Layout - .4byte Mart_Layout - .4byte House3_Layout - .4byte DewfordTown_Gym_Layout - .4byte DewfordTown_Hall_Layout - .4byte House4_Layout - .4byte LavaridgeTown_HerbShop_Layout - .4byte LavaridgeTown_Gym_1F_Layout - .4byte LavaridgeTown_Gym_B1F_Layout - .4byte LavaridgeTown_PokemonCenter_1F_Layout - .4byte FallarborTown_LeftoverRSContestLobby_Layout - .4byte FallarborTown_LeftoverRSContestHall_Layout - .4byte LilycoveCity_House2_Layout - .4byte UnknownMap_08428450_Layout - .4byte VerdanturfTown_WandasHouse_Layout - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House2_Layout - .4byte PetalburgCity_Gym_Layout - .4byte HouseWithBed_Layout - .4byte SlateportCity_SternsShipyard_1F_Layout - .4byte SlateportCity_SternsShipyard_2F_Layout - .4byte UnknownMap_084294C4_Layout - .4byte UnknownMap_084294E8_Layout - .4byte SlateportCity_PokemonFanClub_Layout - .4byte SlateportCity_OceanicMuseum_1F_Layout - .4byte SlateportCity_OceanicMuseum_2F_Layout - .4byte Harbor_Layout - .4byte MauvilleCity_Gym_Layout - .4byte MauvilleCity_BikeShop_Layout - .4byte MauvilleCity_GameCorner_Layout - .4byte RustboroCity_DevonCorp_1F_Layout - .4byte RustboroCity_DevonCorp_2F_Layout - .4byte RustboroCity_Gym_Layout - .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House1_Layout - .4byte RustboroCity_CuttersHouse_Layout - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_Gym_Layout - .4byte FortreeCity_House2_Layout - .4byte Route104_MrBrineysHouse_Layout - .4byte LilycoveCity_LilycoveMuseum_1F_Layout - .4byte LilycoveCity_LilycoveMuseum_2F_Layout - .4byte LilycoveCity_ContestLobby_Layout - .4byte LilycoveCity_ContestHall_Layout - .4byte LilycoveCity_PokemonTrainerFanClub_Layout - .4byte MossdeepCity_Gym_Layout - .4byte SootopolisCity_Gym_1F_Layout - .4byte SootopolisCity_Gym_B1F_Layout - .4byte EverGrandeCity_SidneysRoom_Layout - .4byte EverGrandeCity_PhoebesRoom_Layout - .4byte EverGrandeCity_GlaciasRoom_Layout - .4byte EverGrandeCity_DrakesRoom_Layout - .4byte EverGrandeCity_ChampionsRoom_Layout - .4byte EverGrandeCity_ShortHall_Layout - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte CableCarStation_Layout - .4byte Route114_FossilManiacsHouse_Layout - .4byte Route114_FossilManiacsTunnel_Layout - .4byte Route114_LanettesHouse_Layout - .4byte Route116_TunnelersRestHouse_Layout - .4byte Route117_PokemonDayCare_Layout - .4byte Route121_SafariZoneEntrance_Layout - .4byte MeteorFalls_1F_1R_Layout - .4byte MeteorFalls_1F_2R_Layout - .4byte MeteorFalls_B1F_1R_Layout - .4byte MeteorFalls_B1F_2R_Layout - .4byte RusturfTunnel_Layout - .4byte Underwater_SootopolisCity_Layout - .4byte DesertRuins_Layout - .4byte GraniteCave_1F_Layout - .4byte GraniteCave_B1F_Layout - .4byte GraniteCave_B2F_Layout - .4byte PetalburgWoods_Layout - .4byte MtChimney_Layout - .4byte MtPyre_1F_Layout - .4byte MtPyre_2F_Layout - .4byte MtPyre_3F_Layout - .4byte MtPyre_4F_Layout - .4byte MtPyre_5F_Layout - .4byte MtPyre_6F_Layout - .4byte AquaHideout_1F_Layout - .4byte AquaHideout_B1F_Layout - .4byte AquaHideout_B2F_Layout - .4byte Underwater_SeafloorCavern_Layout - .4byte SeafloorCavern_Entrance_Layout - .4byte SeafloorCavern_Room1_Layout - .4byte SeafloorCavern_Room2_Layout - .4byte SeafloorCavern_Room3_Layout - .4byte SeafloorCavern_Room4_Layout - .4byte SeafloorCavern_Room5_Layout - .4byte SeafloorCavern_Room6_Layout - .4byte SeafloorCavern_Room7_Layout - .4byte SeafloorCavern_Room8_Layout - .4byte SeafloorCavern_Room9_Layout - .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 VictoryRoad_1F_Layout - .4byte ShoalCave_LowTideEntranceRoom_Layout - .4byte ShoalCave_LowTideInnerRoom_Layout - .4byte ShoalCave_LowTideStairsRoom_Layout - .4byte ShoalCave_LowTideLowerRoom_Layout - .4byte ShoalCave_HighTideEntranceRoom_Layout - .4byte ShoalCave_HighTideInnerRoom_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 - .4byte AbandonedShip_Corridors_1F_Layout - .4byte AbandonedShip_Rooms_1F_Layout - .4byte AbandonedShip_Corridors_B1F_Layout - .4byte AbandonedShip_Rooms_B1F_Layout - .4byte AbandonedShip_Rooms2_B1F_Layout - .4byte AbandonedShip_Underwater1_Layout - .4byte AbandonedShip_Room_B1F_Layout - .4byte AbandonedShip_Rooms2_1F_Layout - .4byte AbandonedShip_CaptainsOffice_Layout - .4byte AbandonedShip_Underwater2_Layout - .4byte SecretBase_RedCave1_Layout - .4byte SecretBase_BrownCave1_Layout - .4byte SecretBase_BlueCave1_Layout - .4byte SecretBase_YellowCave1_Layout - .4byte SecretBase_Tree1_Layout - .4byte SecretBase_Shrub1_Layout - .4byte SecretBase_RedCave2_Layout - .4byte SecretBase_BrownCave2_Layout - .4byte SecretBase_BlueCave2_Layout - .4byte SecretBase_YellowCave2_Layout - .4byte SecretBase_Tree2_Layout - .4byte SecretBase_Shrub2_Layout - .4byte SecretBase_RedCave3_Layout - .4byte SecretBase_BrownCave3_Layout - .4byte SecretBase_BlueCave3_Layout - .4byte SecretBase_YellowCave3_Layout - .4byte SecretBase_Tree3_Layout - .4byte SecretBase_Shrub3_Layout - .4byte SecretBase_RedCave4_Layout - .4byte SecretBase_BrownCave4_Layout - .4byte SecretBase_BlueCave4_Layout - .4byte SecretBase_YellowCave4_Layout - .4byte SecretBase_Tree4_Layout - .4byte SecretBase_Shrub4_Layout - .4byte SingleBattleColosseum_Layout - .4byte TradeCenter_Layout - .4byte RecordCorner_Layout - .4byte DoubleBattleColosseum_Layout - .4byte LinkContestRoom1_Layout - .4byte UnknownMap_25_29_Layout - .4byte UnknownMap_25_30_Layout - .4byte UnknownMap_25_31_Layout - .4byte UnknownMap_25_32_Layout - .4byte UnknownMap_25_33_Layout - .4byte UnknownMap_25_34_Layout - .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom6_Layout - .4byte InsideOfTruck_Layout - .4byte SafariZone_Northwest_Layout - .4byte SafariZone_North_Layout - .4byte SafariZone_Southwest_Layout - .4byte SafariZone_South_Layout - .4byte UnknownMap_08447028_Layout - .4byte Route109_SeashoreHouse_Layout - .4byte Route110_TrickHouseEntrance_Layout - .4byte Route110_TrickHouseEnd_Layout - .4byte Route110_TrickHouseCorridor_Layout - .4byte Route110_TrickHousePuzzle1_Layout - .4byte Route110_TrickHousePuzzle2_Layout - .4byte Route110_TrickHousePuzzle3_Layout - .4byte Route110_TrickHousePuzzle4_Layout - .4byte Route110_TrickHousePuzzle5_Layout - .4byte Route110_TrickHousePuzzle6_Layout - .4byte Route110_TrickHousePuzzle7_Layout - .4byte Route110_TrickHousePuzzle8_Layout - .4byte FortreeCity_DecorationShop_Layout - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte LilycoveCity_DepartmentStore_1F_Layout - .4byte LilycoveCity_DepartmentStore_2F_Layout - .4byte LilycoveCity_DepartmentStore_3F_Layout - .4byte LilycoveCity_DepartmentStore_4F_Layout - .4byte LilycoveCity_DepartmentStore_5F_Layout - .4byte LilycoveCity_DepartmentStoreRooftop_Layout - .4byte Route130_Layout - .4byte BattleFrontier_BattleTowerLobby_Layout - .4byte BattleFrontier_OutsideWest_Layout - .4byte BattleElevator_Layout - .4byte BattleFrontier_BattleTowerCorridor_Layout - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte RustboroCity_DevonCorp_3F_Layout - .4byte EverGrandeCity_PokemonLeague_1F_Layout - .4byte Route119_WeatherInstitute_1F_Layout - .4byte Route119_WeatherInstitute_2F_Layout - .4byte LilycoveCity_DepartmentStoreElevator_Layout - .4byte Underwater1_Layout - .4byte MossdeepCity_SpaceCenter_1F_Layout - .4byte MossdeepCity_SpaceCenter_2F_Layout - .4byte SSTidalCorridor_Layout - .4byte SSTidalLowerDeck_Layout - .4byte SSTidalRooms_Layout - .4byte IslandCave_Layout - .4byte AncientTomb_Layout - .4byte Underwater_Route134_Layout - .4byte Underwater_SealedChamber_Layout - .4byte SealedChamber_OuterRoom_Layout - .4byte VictoryRoad_B1F_Layout - .4byte VictoryRoad_B2F_Layout - .4byte Route104_Prototype_Layout - .4byte GraniteCave_StevensRoom_Layout - .4byte AbandonedShip_HiddenFloorCorridors_Layout - .4byte SouthernIsland_Exterior_Layout - .4byte SouthernIsland_Interior_Layout - .4byte JaggedPass_Layout - .4byte FieryPath_Layout - .4byte RustboroCity_Flat2_1F_Layout - .4byte RustboroCity_Flat2_2F_Layout - .4byte RustboroCity_Flat2_3F_Layout - .4byte SootopolisCity_LotadAndSeedotHouse_Layout - .4byte EverGrandeCity_HallOfFame_Layout - .4byte LilycoveCity_CoveLilyMotel_1F_Layout - .4byte LilycoveCity_CoveLilyMotel_2F_Layout - .4byte Route124_DivingTreasureHuntersHouse_Layout - .4byte MtPyre_Exterior_Layout - .4byte MtPyre_Summit_Layout - .4byte SealedChamber_InnerRoom_Layout - .4byte MossdeepCity_GameCorner_1F_Layout - .4byte MossdeepCity_GameCorner_B1F_Layout - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House3_Layout - .4byte AbandonedShip_HiddenFloorRooms_Layout - .4byte ScorchedSlab_Layout - .4byte UnknownMap_0845A394_Layout - .4byte RustboroCity_Flat1_1F_Layout - .4byte RustboroCity_Flat1_2F_Layout - .4byte EverGrandeCity_Hall4_Layout - .4byte AquaHideout_UnusedRubyMap1_Layout - .4byte AquaHideout_UnusedRubyMap2_Layout - .4byte AquaHideout_UnusedRubyMap3_Layout - .4byte UnknownMap_0845D470_Layout - .4byte SkyPillar_Entrance_Layout - .4byte SkyPillar_Outside_Layout - .4byte SkyPillar_1F_Layout - .4byte SkyPillar_2F_Layout - .4byte SkyPillar_3F_Layout - .4byte SkyPillar_4F_Layout - .4byte UnknownMap_0845ECB4_Layout - .4byte MossdeepCity_StevensHouse_Layout - .4byte ShoalCave_LowTideIceRoom_Layout - .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 Route111_NoMirageTower_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 diff --git a/data/map_events.s b/data/map_events.s index 6b20620764..c6f88d305c 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -12,522 +12,5 @@ .section .rodata - .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/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/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/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_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" - .include "data/maps/Route119_WeatherInstitute_2F/events.inc" - .include "data/maps/Route119_House/events.inc" - .include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc" + .include "data/maps/events.inc" diff --git a/data/maps.s b/data/maps.s index 6e6545fbce..3334fd103a 100644 --- a/data/maps.s +++ b/data/maps.s @@ -10,8 +10,8 @@ .section .rodata - .include "data/layouts.inc" - .include "data/layouts_table.inc" + .include "data/layouts/layouts.inc" + .include "data/layouts/layouts_table.inc" .include "data/maps/headers.inc" .include "data/maps/groups.inc" .include "data/maps/connections.inc" diff --git a/data/maps/.gitignore b/data/maps/.gitignore new file mode 100755 index 0000000000..c07d4e03a6 --- /dev/null +++ b/data/maps/.gitignore @@ -0,0 +1,7 @@ +connections.in +events.inc +groups.inc +headers.inc +**/connections.inc +**/events.inc +**/header.inc diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc deleted file mode 100644 index aff922c97e..0000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -AbandonedShip_CaptainsOffice_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY - -AbandonedShip_CaptainsOffice_MapWarps: - warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - -AbandonedShip_CaptainsOffice_MapEvents:: - map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc deleted file mode 100644 index a3fbacdc7e..0000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_CaptainsOffice: - .4byte AbandonedShip_CaptainsOffice_Layout - .4byte AbandonedShip_CaptainsOffice_MapEvents - .4byte AbandonedShip_CaptainsOffice_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json new file mode 100644 index 0000000000..69a8b31cb4 --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", + "name": "AbandonedShip_CaptainsOffice", + "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_CaptainsOffice_EventScript_29126E", + "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY" + } + ], + "warp_events": [ + { + "x": 7, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc deleted file mode 100644 index e9efcc82ab..0000000000 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -AbandonedShip_Corridors_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 - -AbandonedShip_Corridors_1F_MapWarps: - warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK - warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK - warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK - warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK - warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F - warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F - -AbandonedShip_Corridors_1F_MapEvents:: - map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc deleted file mode 100644 index fc296e7623..0000000000 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_1F: - .4byte AbandonedShip_Corridors_1F_Layout - .4byte AbandonedShip_Corridors_1F_MapEvents - .4byte AbandonedShip_Corridors_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json new file mode 100644 index 0000000000..d2f65aee41 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -0,0 +1,132 @@ +{ + "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "name": "AbandonedShip_Corridors_1F", + "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Corridors_1F_EventScript_2379A5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Corridors_1F_EventScript_2379AE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 2 + }, + { + "x": 0, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 6 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc deleted file mode 100644 index bbe3153e09..0000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -AbandonedShip_Corridors_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 - -AbandonedShip_Corridors_B1F_MapWarps: - warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F - warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F - warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F - warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Corridors_B1F_MapBGEvents: - bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 - -AbandonedShip_Corridors_B1F_MapEvents:: - map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents - diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc deleted file mode 100644 index 7b03645fda..0000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_B1F: - .4byte AbandonedShip_Corridors_B1F_Layout - .4byte AbandonedShip_Corridors_B1F_MapEvents - .4byte AbandonedShip_Corridors_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json new file mode 100644 index 0000000000..7e27751b12 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -0,0 +1,113 @@ +{ + "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "name": "AbandonedShip_Corridors_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Corridors_B1F_EventScript_237E13", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOM_B1F", + "dest_warp_id": 0 + }, + { + "x": 0, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 10 + }, + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_Corridors_B1F_EventScript_237DC8" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc deleted file mode 100644 index 70fa72c4f7..0000000000 --- a/data/maps/AbandonedShip_Deck/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_Deck_MapWarps: - warp_def 13, 15, 3, 0, MAP_ROUTE108 - warp_def 14, 15, 3, 0, MAP_ROUTE108 - warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE - -AbandonedShip_Deck_MapEvents:: - map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc deleted file mode 100644 index 395f4404d6..0000000000 --- a/data/maps/AbandonedShip_Deck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Deck: - .4byte AbandonedShip_Deck_Layout - .4byte AbandonedShip_Deck_MapEvents - .4byte AbandonedShip_Deck_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_DECK - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json new file mode 100644 index 0000000000..b12ff40575 --- /dev/null +++ b/data/maps/AbandonedShip_Deck/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ABANDONED_SHIP_DECK", + "name": "AbandonedShip_Deck", + "layout": "LAYOUT_ABANDONED_SHIP_DECK", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE108", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE108", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc deleted file mode 100644 index 5b0130c3ef..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps: - warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - -AbandonedShip_HiddenFloorCorridors_MapBGEvents: - bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 - bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE - -AbandonedShip_HiddenFloorCorridors_MapEvents:: - map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents - diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc deleted file mode 100644 index cc268ca6e0..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorCorridors: - .4byte AbandonedShip_HiddenFloorCorridors_Layout - .4byte AbandonedShip_HiddenFloorCorridors_MapEvents - .4byte AbandonedShip_HiddenFloorCorridors_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json new file mode 100644 index 0000000000..1b1466fe1e --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -0,0 +1,96 @@ +{ + "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "name": "AbandonedShip_HiddenFloorCorridors", + "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 7 + }, + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc deleted file mode 100644 index 380e7f958b..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -AbandonedShip_HiddenFloorRooms_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE - -AbandonedShip_HiddenFloorRooms_MapWarps: - warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - -AbandonedShip_HiddenFloorRooms_MapBGEvents: - bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY - bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY - bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY - bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY - bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - -AbandonedShip_HiddenFloorRooms_MapEvents:: - map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc deleted file mode 100644 index 24889acd1f..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorRooms: - .4byte AbandonedShip_HiddenFloorRooms_Layout - .4byte AbandonedShip_HiddenFloorRooms_MapEvents - .4byte AbandonedShip_HiddenFloorRooms_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json new file mode 100644 index 0000000000..51fc0f2603 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -0,0 +1,218 @@ +{ + "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "name": "AbandonedShip_HiddenFloorRooms", + "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 41, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_291288", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_291295", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE" + } + ], + "warp_events": [ + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 1 + }, + { + "x": 36, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 2 + }, + { + "x": 37, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 4 + }, + { + "x": 36, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 10, + "elevation": 3, + "item": "ITEM_ROOM_1_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY" + }, + { + "type": "hidden_item", + "x": 20, + "y": 5, + "elevation": 3, + "item": "ITEM_ROOM_2_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY" + }, + { + "type": "hidden_item", + "x": 1, + "y": 12, + "elevation": 3, + "item": "ITEM_ROOM_4_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY" + }, + { + "type": "hidden_item", + "x": 1, + "y": 2, + "elevation": 0, + "item": "ITEM_ROOM_6_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY" + }, + { + "type": "sign", + "x": 8, + "y": 5, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 11, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 10, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 16, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 25, + "y": 2, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 24, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc deleted file mode 100644 index d0cddd45b5..0000000000 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_Room_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 - -AbandonedShip_Room_B1F_MapWarps: - warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Room_B1F_MapEvents:: - map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc deleted file mode 100644 index c6dd8ee37d..0000000000 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Room_B1F: - .4byte AbandonedShip_Room_B1F_Layout - .4byte AbandonedShip_Room_B1F_MapEvents - .4byte AbandonedShip_Room_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOM_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json new file mode 100644 index 0000000000..f762b08f9c --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOM_B1F", + "name": "AbandonedShip_Room_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Room_B1F_EventScript_291254", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc deleted file mode 100644 index 71b0416e37..0000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 - object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 - -AbandonedShip_Rooms2_1F_MapWarps: - warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Rooms2_1F_MapEvents:: - map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc deleted file mode 100644 index e9a55f93e2..0000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F: - .4byte AbandonedShip_Rooms2_1F_Layout - .4byte AbandonedShip_Rooms2_1F_MapEvents - .4byte AbandonedShip_Rooms2_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json new file mode 100644 index 0000000000..84ccb93dcf --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "name": "AbandonedShip_Rooms2_1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "AbandonedShip_Rooms2_1F_EventScript_23810B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_1F_EventScript_291261", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Rooms2_1F_EventScript_238186", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Rooms2_1F_EventScript_23816F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc deleted file mode 100644 index 3c47ae3bb0..0000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -AbandonedShip_Rooms2_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL - -AbandonedShip_Rooms2_B1F_MapWarps: - warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Rooms2_B1F_MapEvents:: - map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc deleted file mode 100644 index 4afe519374..0000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_B1F: - .4byte AbandonedShip_Rooms2_B1F_Layout - .4byte AbandonedShip_Rooms2_B1F_MapEvents - .4byte AbandonedShip_Rooms2_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json new file mode 100644 index 0000000000..2e8256331a --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "name": "AbandonedShip_Rooms2_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_B1F_EventScript_238025", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_B1F_EventScript_291247", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc deleted file mode 100644 index b63f2bd72f..0000000000 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -AbandonedShip_Rooms_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 - -AbandonedShip_Rooms_1F_MapWarps: - warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Rooms_1F_MapEvents:: - map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc deleted file mode 100644 index 60607565c3..0000000000 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_1F: - .4byte AbandonedShip_Rooms_1F_Layout - .4byte AbandonedShip_Rooms_1F_MapEvents - .4byte AbandonedShip_Rooms_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json new file mode 100644 index 0000000000..789b4edb51 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS_1F", + "name": "AbandonedShip_Rooms_1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_1F_EventScript_237A93", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_1F_EventScript_29122D", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Rooms_1F_EventScript_237AB3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Rooms_1F_EventScript_237A9C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 6 + }, + { + "x": 13, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 5 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 7 + }, + { + "x": 14, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc deleted file mode 100644 index eda95460bd..0000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -AbandonedShip_Rooms_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE - -AbandonedShip_Rooms_B1F_MapWarps: - warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Rooms_B1F_MapEvents:: - map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc deleted file mode 100644 index 582123b345..0000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_B1F: - .4byte AbandonedShip_Rooms_B1F_Layout - .4byte AbandonedShip_Rooms_B1F_MapEvents - .4byte AbandonedShip_Rooms_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json new file mode 100644 index 0000000000..224b25165b --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "name": "AbandonedShip_Rooms_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_B1F_EventScript_29123A", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 3 + }, + { + "x": 22, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc deleted file mode 100644 index c6c4e226fa..0000000000 --- a/data/maps/AbandonedShip_Underwater1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -AbandonedShip_Underwater1_MapWarps: - warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - -AbandonedShip_Underwater1_MapEvents:: - map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc deleted file mode 100644 index d77b43cac4..0000000000 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater1: - .4byte AbandonedShip_Underwater1_Layout - .4byte AbandonedShip_Underwater1_MapEvents - .4byte AbandonedShip_Underwater1_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER1 - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json new file mode 100644 index 0000000000..de9c778159 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_ABANDONED_SHIP_UNDERWATER1", + "name": "AbandonedShip_Underwater1", + "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc deleted file mode 100644 index f4fadb1bae..0000000000 --- a/data/maps/AbandonedShip_Underwater2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -AbandonedShip_Underwater2_MapWarps: - warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 - -AbandonedShip_Underwater2_MapEvents:: - map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc deleted file mode 100644 index eb08a5f709..0000000000 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater2: - .4byte AbandonedShip_Underwater2_Layout - .4byte AbandonedShip_Underwater2_MapEvents - .4byte AbandonedShip_Underwater2_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER2 - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json new file mode 100644 index 0000000000..c1c9f24d36 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_ABANDONED_SHIP_UNDERWATER2", + "name": "AbandonedShip_Underwater2", + "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc deleted file mode 100644 index 0963e38015..0000000000 --- a/data/maps/AlteringCave/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -AlteringCave_MapWarps: - warp_def 18, 22, 0, 0, MAP_ROUTE103 - -AlteringCave_MapEvents:: - map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc deleted file mode 100644 index 551d704248..0000000000 --- a/data/maps/AlteringCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AlteringCave: - .4byte AlteringCave_Layout - .4byte AlteringCave_MapEvents - .4byte AlteringCave_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_ALTERING_CAVE - .byte MAPSEC_ALTERING_CAVE_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json new file mode 100644 index 0000000000..848eb95c19 --- /dev/null +++ b/data/maps/AlteringCave/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_ALTERING_CAVE", + "name": "AlteringCave", + "layout": "LAYOUT_ALTERING_CAVE", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_ALTERING_CAVE_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 22, + "elevation": 0, + "dest_map": "MAP_ROUTE103", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc deleted file mode 100644 index 06dedb33ed..0000000000 --- a/data/maps/AncientTomb/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -AncientTomb_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL - -AncientTomb_MapWarps: - warp_def 8, 29, 3, 0, MAP_ROUTE120 - warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB - warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB - -AncientTomb_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033 - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 - -AncientTomb_MapEvents:: - map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents - diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc deleted file mode 100644 index f1c3b4111d..0000000000 --- a/data/maps/AncientTomb/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AncientTomb: - .4byte AncientTomb_Layout - .4byte AncientTomb_MapEvents - .4byte AncientTomb_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_ANCIENT_TOMB - .byte MAPSEC_ANCIENT_TOMB - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json new file mode 100644 index 0000000000..327e7eded5 --- /dev/null +++ b/data/maps/AncientTomb/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_ANCIENT_TOMB", + "name": "AncientTomb", + "layout": "LAYOUT_ANCIENT_TOMB", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_ANCIENT_TOMB", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGISTEEL", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AncientTomb_EventScript_23905A", + "flag": "FLAG_HIDE_REGISTEEL" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE120", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239033" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239050" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239050" + } + ] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc deleted file mode 100644 index 663ae0ada0..0000000000 --- a/data/maps/AquaHideout_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -AquaHideout_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_1F_MapWarps: - warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY - warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY - warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_1F_MapEvents:: - map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc deleted file mode 100644 index 30e045f797..0000000000 --- a/data/maps/AquaHideout_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_1F: - .4byte AquaHideout_1F_Layout - .4byte AquaHideout_1F_MapEvents - .4byte AquaHideout_1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_1F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json new file mode 100644 index 0000000000..278bc5894d --- /dev/null +++ b/data/maps/AquaHideout_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_AQUA_HIDEOUT_1F", + "name": "AquaHideout_1F", + "layout": "LAYOUT_AQUA_HIDEOUT_1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_1F_EventScript_233494", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_1F_EventScript_2334C6", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 20, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 13, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AquaHideout_1F_EventScript_2334F8", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 27, + "elevation": 1, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 6 + }, + { + "x": 14, + "y": 27, + "elevation": 1, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 6 + }, + { + "x": 22, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc deleted file mode 100644 index edc3df4c64..0000000000 --- a/data/maps/AquaHideout_B1F/events.inc +++ /dev/null @@ -1,41 +0,0 @@ -AquaHideout_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_B1F_MapWarps: - warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F - warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F - warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F - warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F - warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F - warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F - warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F - warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F - warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_B1F_MapEvents:: - map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc deleted file mode 100644 index dfe453ddd4..0000000000 --- a/data/maps/AquaHideout_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B1F: - .4byte AquaHideout_B1F_Layout - .4byte AquaHideout_B1F_MapEvents - .4byte AquaHideout_B1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_B1F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json new file mode 100644 index 0000000000..80c4af8efd --- /dev/null +++ b/data/maps/AquaHideout_B1F/map.json @@ -0,0 +1,314 @@ +{ + "id": "MAP_AQUA_HIDEOUT_B1F", + "name": "AquaHideout_B1F", + "layout": "LAYOUT_AQUA_HIDEOUT_B1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 28, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233A85", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B1F_EventScript_233AB0", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291372", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 20, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233AD5", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291358", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_2339EB", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291365", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_233A38", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 28, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233AEC", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 29, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_1F", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 7 + }, + { + "x": 27, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 8 + }, + { + "x": 20, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 10 + }, + { + "x": 27, + "y": 12, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 15, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 5 + }, + { + "x": 3, + "y": 20, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 32, + "y": 19, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 6 + }, + { + "x": 23, + "y": 10, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 22 + }, + { + "x": 45, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 9 + }, + { + "x": 42, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 18 + }, + { + "x": 45, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 48, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 16 + }, + { + "x": 42, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 15 + }, + { + "x": 45, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 20 + }, + { + "x": 48, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 13 + }, + { + "x": 42, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 24 + }, + { + "x": 45, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 17 + }, + { + "x": 48, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 42, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 11 + }, + { + "x": 45, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 17 + }, + { + "x": 48, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 19 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc deleted file mode 100644 index f24115c324..0000000000 --- a/data/maps/AquaHideout_B2F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -AquaHideout_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_B2F_MapWarps: - warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F - warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F - warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F - warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F - warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F - warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F - warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F - warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F - warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_B2F_MapCoordEvents: - coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 - coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 - -AquaHideout_B2F_MapEvents:: - map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 - diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc deleted file mode 100644 index 3d87c7ad3a..0000000000 --- a/data/maps/AquaHideout_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B2F: - .4byte AquaHideout_B2F_Layout - .4byte AquaHideout_B2F_MapEvents - .4byte AquaHideout_B2F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_B2F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json new file mode 100644 index 0000000000..56bbaab304 --- /dev/null +++ b/data/maps/AquaHideout_B2F/map.json @@ -0,0 +1,189 @@ +{ + "id": "MAP_AQUA_HIDEOUT_B2F", + "name": "AquaHideout_B2F", + "layout": "LAYOUT_AQUA_HIDEOUT_B2F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B2F_EventScript_233E09", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AquaHideout_B2F_EventScript_233E8A", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B2F_EventScript_29137F", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "x": 19, + "y": 20, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B2F_EventScript_233EAF", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B2F_EventScript_233EC6", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 18, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 7 + }, + { + "x": 12, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 6 + }, + { + "x": 31, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 4 + }, + { + "x": 32, + "y": 20, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 28, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "AquaHideout_B2F_EventScript_233DE5" + }, + { + "type": "trigger", + "x": 28, + "y": 16, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "AquaHideout_B2F_EventScript_233DE5" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc deleted file mode 100644 index f8107f4795..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc deleted file mode 100644 index 30946c6f8d..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap1: - .4byte AquaHideout_UnusedRubyMap1_Layout - .4byte AquaHideout_UnusedRubyMap1_MapEvents - .4byte AquaHideout_UnusedRubyMap1_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json new file mode 100644 index 0000000000..22b6454134 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "name": "AquaHideout_UnusedRubyMap1", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc deleted file mode 100644 index 569e13cb09..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc deleted file mode 100644 index cd08fcc5e8..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap2: - .4byte AquaHideout_UnusedRubyMap2_Layout - .4byte AquaHideout_UnusedRubyMap2_MapEvents - .4byte AquaHideout_UnusedRubyMap2_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json new file mode 100644 index 0000000000..5bee651589 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "name": "AquaHideout_UnusedRubyMap2", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc deleted file mode 100644 index 7618c0d58e..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc deleted file mode 100644 index 993f10aff9..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap3: - .4byte AquaHideout_UnusedRubyMap3_Layout - .4byte AquaHideout_UnusedRubyMap3_MapEvents - .4byte AquaHideout_UnusedRubyMap3_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json new file mode 100644 index 0000000000..03cafd7dc0 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "name": "AquaHideout_UnusedRubyMap3", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc deleted file mode 100644 index f53e074b90..0000000000 --- a/data/maps/ArtisanCave_1F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -ArtisanCave_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS - -ArtisanCave_1F_MapWarps: - warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F - -ArtisanCave_1F_MapEvents:: - map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc deleted file mode 100644 index 670aa6845c..0000000000 --- a/data/maps/ArtisanCave_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_1F: - .4byte ArtisanCave_1F_Layout - .4byte ArtisanCave_1F_MapEvents - .4byte ArtisanCave_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_ARTISAN_CAVE_1F - .byte MAPSEC_ARTISAN_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json new file mode 100644 index 0000000000..a0792d7335 --- /dev/null +++ b/data/maps/ArtisanCave_1F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ARTISAN_CAVE_1F", + "name": "ArtisanCave_1F", + "layout": "LAYOUT_ARTISAN_CAVE_1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_ARTISAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ArtisanCave_1F_EventScript_2914D1", + "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS" + } + ], + "warp_events": [ + { + "x": 10, + "y": 17, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 13 + }, + { + "x": 6, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_B1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc deleted file mode 100644 index 7572aaa2ad..0000000000 --- a/data/maps/ArtisanCave_B1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -ArtisanCave_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP - -ArtisanCave_B1F_MapWarps: - warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F - -ArtisanCave_B1F_MapBGEvents: - bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC - bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM - bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN - bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON - -ArtisanCave_B1F_MapEvents:: - map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents - diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc deleted file mode 100644 index fd1adb32fc..0000000000 --- a/data/maps/ArtisanCave_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_B1F: - .4byte ArtisanCave_B1F_Layout - .4byte ArtisanCave_B1F_MapEvents - .4byte ArtisanCave_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_ARTISAN_CAVE_B1F - .byte MAPSEC_ARTISAN_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json new file mode 100644 index 0000000000..d47609dc88 --- /dev/null +++ b/data/maps/ArtisanCave_B1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ARTISAN_CAVE_B1F", + "name": "ArtisanCave_B1F", + "layout": "LAYOUT_ARTISAN_CAVE_B1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_ARTISAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ArtisanCave_B1F_EventScript_2914C4", + "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP" + } + ], + "warp_events": [ + { + "x": 8, + "y": 48, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 10 + }, + { + "x": 38, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 32, + "y": 29, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC" + }, + { + "type": "hidden_item", + "x": 27, + "y": 8, + "elevation": 0, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM" + }, + { + "type": "hidden_item", + "x": 7, + "y": 5, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN" + }, + { + "type": "hidden_item", + "x": 19, + "y": 43, + "elevation": 0, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc deleted file mode 100644 index 4d8b6ea2fc..0000000000 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleArenaBattleRoom_MapEvents:: - map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc deleted file mode 100644 index 1c4cf3eb07..0000000000 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom: - .4byte BattleFrontier_BattleArenaBattleRoom_Layout - .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents - .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json new file mode 100644 index 0000000000..5b1a51ad52 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "name": "BattleFrontier_BattleArenaBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc deleted file mode 100644 index 5be3b04e6c..0000000000 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleArenaCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleArenaCorridor_MapEvents:: - map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc deleted file mode 100644 index 17341a3e86..0000000000 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaCorridor: - .4byte BattleFrontier_BattleArenaCorridor_Layout - .4byte BattleFrontier_BattleArenaCorridor_MapEvents - .4byte BattleFrontier_BattleArenaCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json new file mode 100644 index 0000000000..2cacf66215 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "name": "BattleFrontier_BattleArenaCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 9, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc deleted file mode 100644 index a63202848b..0000000000 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -BattleFrontier_BattleArenaLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 - -BattleFrontier_BattleArenaLobby_MapWarps: - warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattleArenaLobby_MapBGEvents: - bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092 - bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA - -BattleFrontier_BattleArenaLobby_MapEvents:: - map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc deleted file mode 100644 index db8f456ff3..0000000000 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaLobby: - .4byte BattleFrontier_BattleArenaLobby_Layout - .4byte BattleFrontier_BattleArenaLobby_MapEvents - .4byte BattleFrontier_BattleArenaLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json new file mode 100644 index 0000000000..fc8e5bd373 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -0,0 +1,111 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "name": "BattleFrontier_BattleArenaLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_255DF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560C1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 14, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560A6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 12, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleArenaLobby_EventScript_256092" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc deleted file mode 100644 index ce8f66f6bf..0000000000 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomeBattleRoom_MapEvents:: - map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc deleted file mode 100644 index 593adeb6f3..0000000000 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom: - .4byte BattleFrontier_BattleDomeBattleRoom_Layout - .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents - .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json new file mode 100644 index 0000000000..e897866d4f --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomeBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "music": "MUS_B_DOME", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 9, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 11, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 16, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 16, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 8, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 13, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 9, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 14, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc deleted file mode 100644 index 3d3f5be4bd..0000000000 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomeCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomeCorridor_MapWarps: - warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomeCorridor_MapEvents:: - map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc deleted file mode 100644 index 3ce5b2b5e0..0000000000 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeCorridor: - .4byte BattleFrontier_BattleDomeCorridor_Layout - .4byte BattleFrontier_BattleDomeCorridor_MapEvents - .4byte BattleFrontier_BattleDomeCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME1 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json new file mode 100644 index 0000000000..3f7dc3bdae --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "name": "BattleFrontier_BattleDomeCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "music": "MUS_B_DOME1", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 23, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc deleted file mode 100644 index abf8671326..0000000000 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattleDomeLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 - -BattleFrontier_BattleDomeLobby_MapWarps: - warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomeLobby_MapBGEvents: - bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52 - bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84 - bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B - bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34 - -BattleFrontier_BattleDomeLobby_MapEvents:: - map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc deleted file mode 100644 index cf0c576191..0000000000 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeLobby: - .4byte BattleFrontier_BattleDomeLobby_Layout - .4byte BattleFrontier_BattleDomeLobby_MapEvents - .4byte BattleFrontier_BattleDomeLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME1 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json new file mode 100644 index 0000000000..c94d1e1c7b --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -0,0 +1,147 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "name": "BattleFrontier_BattleDomeLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "music": "MUS_B_DOME1", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249A35", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 14, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 18, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249DED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 17, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249A47", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 16, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D52" + }, + { + "type": "sign", + "x": 7, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D84" + }, + { + "type": "sign", + "x": 18, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D6B" + }, + { + "type": "sign", + "x": 15, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc deleted file mode 100644 index 0714b7b68d..0000000000 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomePreBattleRoom_MapWarps: - warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomePreBattleRoom_MapEvents:: - map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc deleted file mode 100644 index 84637906d8..0000000000 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom: - .4byte BattleFrontier_BattleDomePreBattleRoom_Layout - .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents - .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json new file mode 100644 index 0000000000..0e96decdfd --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomePreBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "music": "MUS_B_DOME", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc deleted file mode 100644 index 5f3a6a218e..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleFactoryBattleRoom_MapEvents:: - map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc deleted file mode 100644 index cb20b3f1ee..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom: - .4byte BattleFrontier_BattleFactoryBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents - .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json new file mode 100644 index 0000000000..de1cdd2ff1 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc deleted file mode 100644 index 7cfccd0ff5..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -BattleFrontier_BattleFactoryLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 - object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 - -BattleFrontier_BattleFactoryLobby_MapWarps: - warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleFactoryLobby_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 - bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839 - -BattleFrontier_BattleFactoryLobby_MapEvents:: - map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc deleted file mode 100644 index 30bd38b686..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryLobby: - .4byte BattleFrontier_BattleFactoryLobby_Layout - .4byte BattleFrontier_BattleFactoryLobby_MapEvents - .4byte BattleFrontier_BattleFactoryLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json new file mode 100644 index 0000000000..87ad1077ab --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "name": "BattleFrontier_BattleFactoryLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 4, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 14, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_25881C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 13, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 6, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587E1" + }, + { + "type": "sign", + "x": 11, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587FA" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc deleted file mode 100644 index 944ff81429..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: - map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc deleted file mode 100644 index ecbfc37a97..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom: - .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json new file mode 100644 index 0000000000..4d9d792f7a --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryPreBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 8, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc deleted file mode 100644 index 95aacea959..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePalaceBattleRoom_MapWarps: - warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - -BattleFrontier_BattlePalaceBattleRoom_MapEvents:: - map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc deleted file mode 100644 index 035cd8758e..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom: - .4byte BattleFrontier_BattlePalaceBattleRoom_Layout - .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents - .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json new file mode 100644 index 0000000000..b0405cff03 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "name": "BattleFrontier_BattlePalaceBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DUSCLOPS", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc deleted file mode 100644 index 578c2cc436..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePalaceCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0 - -BattleFrontier_BattlePalaceCorridor_MapWarps: - warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - -BattleFrontier_BattlePalaceCorridor_MapEvents:: - map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc deleted file mode 100644 index 6d2f8ffb05..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceCorridor: - .4byte BattleFrontier_BattlePalaceCorridor_Layout - .4byte BattleFrontier_BattlePalaceCorridor_MapEvents - .4byte BattleFrontier_BattlePalaceCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json new file mode 100644 index 0000000000..34378700eb --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -0,0 +1,141 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "name": "BattleFrontier_BattlePalaceCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 3, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KIRLIA", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 15, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 4, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 13, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 3, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 13, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 13, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 3, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc deleted file mode 100644 index 4c2d924b2f..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattlePalaceLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 - object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 - -BattleFrontier_BattlePalaceLobby_MapWarps: - warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - -BattleFrontier_BattlePalaceLobby_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 - bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 - bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 - -BattleFrontier_BattlePalaceLobby_MapEvents:: - map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc deleted file mode 100644 index 8846982cf4..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceLobby: - .4byte BattleFrontier_BattlePalaceLobby_Layout - .4byte BattleFrontier_BattlePalaceLobby_MapEvents - .4byte BattleFrontier_BattlePalaceLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json new file mode 100644 index 0000000000..ccdbe327ae --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "name": "BattleFrontier_BattlePalaceLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D944", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 24, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC9D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 18, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 2, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 19, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D956", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC50" + }, + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC69" + }, + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc deleted file mode 100644 index ace2657bbc..0000000000 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeCorridor_MapEvents:: - map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc deleted file mode 100644 index cecd6fba15..0000000000 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeCorridor: - .4byte BattleFrontier_BattlePikeCorridor_Layout - .4byte BattleFrontier_BattlePikeCorridor_MapEvents - .4byte BattleFrontier_BattlePikeCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json new file mode 100644 index 0000000000..e35831a6d3 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "name": "BattleFrontier_BattlePikeCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc deleted file mode 100644 index b28d48d6ac..0000000000 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePikeLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 - object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 - -BattleFrontier_BattlePikeLobby_MapWarps: - warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattlePikeLobby_MapBGEvents: - bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80 - bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 - -BattleFrontier_BattlePikeLobby_MapEvents:: - map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc deleted file mode 100644 index a3746c1143..0000000000 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeLobby: - .4byte BattleFrontier_BattlePikeLobby_Layout - .4byte BattleFrontier_BattlePikeLobby_MapEvents - .4byte BattleFrontier_BattlePikeLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json new file mode 100644 index 0000000000..938e4da3f3 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "name": "BattleFrontier_BattlePikeLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BA80" + }, + { + "type": "sign", + "x": 1, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc deleted file mode 100644 index 34f802c916..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 - -BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: - coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 - coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - -BattleFrontier_BattlePikeRandomRoom1_MapEvents:: - map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc deleted file mode 100644 index ff61d12384..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1: - .4byte BattleFrontier_BattlePikeRandomRoom1_Layout - .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json new file mode 100644 index 0000000000..9ed644d798 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -0,0 +1,111 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "name": "BattleFrontier_BattlePikeRandomRoom1", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 3, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + }, + { + "type": "trigger", + "x": 4, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + }, + { + "type": "trigger", + "x": 5, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc deleted file mode 100644 index 0d929a2ae3..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: - map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc deleted file mode 100644 index 6ab11ae02e..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2: - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json new file mode 100644 index 0000000000..437e7fcfd2 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc deleted file mode 100644 index 9b3a6234e0..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: - coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 - coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - -BattleFrontier_BattlePikeRandomRoom3_MapEvents:: - map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc deleted file mode 100644 index fabb3a8ef7..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3: - .4byte BattleFrontier_BattlePikeRandomRoom3_Layout - .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json new file mode 100644 index 0000000000..60aeee81cc --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "name": "BattleFrontier_BattlePikeRandomRoom3", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174" + }, + { + "type": "trigger", + "x": 3, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 4, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 5, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 3, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + }, + { + "type": "trigger", + "x": 4, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + }, + { + "type": "trigger", + "x": 5, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc deleted file mode 100644 index 59abdb9708..0000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 - object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 - -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: - coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E - coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 - coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 - coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: - map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc deleted file mode 100644 index 718d5d3e60..0000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom: - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents - .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json new file mode 100644 index 0000000000..e2d0645cb0 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -0,0 +1,129 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "name": "BattleFrontier_BattlePikeThreePathRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" + }, + { + "type": "trigger", + "x": 6, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" + }, + { + "type": "trigger", + "x": 10, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" + }, + { + "type": "trigger", + "x": 5, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 5, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc deleted file mode 100644 index 3c8e0fda8f..0000000000 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 - object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 - -BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: - warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: - map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc deleted file mode 100644 index c60cf97f26..0000000000 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner: - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json new file mode 100644 index 0000000000..2184971eb0 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "name": "BattleFrontier_BattlePointExchangeServiceCorner", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 0, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 14, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 9, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 12, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc deleted file mode 100644 index 793434de3e..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: - map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc deleted file mode 100644 index 46b22aa7aa..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare: - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents - .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json new file mode 100644 index 0000000000..aab03982fd --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -0,0 +1,229 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "name": "BattleFrontier_BattlePyramidEmptySquare", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "music": "65535", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 0, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc deleted file mode 100644 index 81a4203b5a..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -BattleFrontier_BattlePyramidLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 - -BattleFrontier_BattlePyramidLobby_MapWarps: - warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattlePyramidLobby_MapBGEvents: - bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 - bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 - -BattleFrontier_BattlePyramidLobby_MapEvents:: - map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc deleted file mode 100644 index f8e7408a02..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidLobby: - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidLobby_MapEvents - .4byte BattleFrontier_BattlePyramidLobby_MapScripts - .4byte 0x0 - .2byte MUS_PYRAMID - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json new file mode 100644 index 0000000000..7ffd80dcf4 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "name": "BattleFrontier_BattlePyramidLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "music": "MUS_PYRAMID", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 7, + "y": 12, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 14, + "y": 13, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 2, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 16, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42" + }, + { + "type": "sign", + "x": 1, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc deleted file mode 100644 index 9e1cd9f4f5..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattlePyramidTop_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 - object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePyramidTop_MapCoordEvents: - coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 - -BattleFrontier_BattlePyramidTop_MapEvents:: - map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc deleted file mode 100644 index e2e8ec59a6..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidTop: - .4byte BattleFrontier_BattlePyramidTop_Layout - .4byte BattleFrontier_BattlePyramidTop_MapEvents - .4byte BattleFrontier_BattlePyramidTop_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json new file mode 100644 index 0000000000..09fe56ef1a --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -0,0 +1,57 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "name": "BattleFrontier_BattlePyramidTop", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "music": "65535", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 17, + "y": 11, + "elevation": 6, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BRANDON", + "x": 17, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 9, + "elevation": 4, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePyramidTop_EventScript_255256" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc deleted file mode 100644 index 4de7382b23..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerBattleRoom_MapWarps: - warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - -BattleFrontier_BattleTowerBattleRoom_MapEvents:: - map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc deleted file mode 100644 index 5f8b03ace3..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom: - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents - .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json new file mode 100644 index 0000000000..736fd55c83 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc deleted file mode 100644 index 97dc0c8570..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerBattleRoom2_MapEvents:: - map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc deleted file mode 100644 index 464ed85666..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2: - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents - .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json new file mode 100644 index 0000000000..60d7bc73ac --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2", + "name": "BattleFrontier_BattleTowerBattleRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc deleted file mode 100644 index 80b239fbcd..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerCorridor_MapEvents:: - map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc deleted file mode 100644 index 7774e0f3bd..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor: - .4byte BattleFrontier_BattleTowerCorridor_Layout - .4byte BattleFrontier_BattleTowerCorridor_MapEvents - .4byte BattleFrontier_BattleTowerCorridor_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json new file mode 100644 index 0000000000..c99dcac09f --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "name": "BattleFrontier_BattleTowerCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc deleted file mode 100644 index 726c4b58aa..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerCorridor2_MapEvents:: - map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc deleted file mode 100644 index 9a8676f937..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor2: - .4byte BattleFrontier_BattleTowerCorridor2_Layout - .4byte BattleFrontier_BattleTowerCorridor2_MapEvents - .4byte BattleFrontier_BattleTowerCorridor2_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json new file mode 100644 index 0000000000..a15882e77d --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -0,0 +1,73 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "name": "BattleFrontier_BattleTowerCorridor2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "x": 14, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc deleted file mode 100644 index a33f30c9e0..0000000000 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerElevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerElevator_MapEvents:: - map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc deleted file mode 100644 index 3267daa20d..0000000000 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerElevator: - .4byte BattleElevator_Layout - .4byte BattleFrontier_BattleTowerElevator_MapEvents - .4byte BattleFrontier_BattleTowerElevator_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_ELEVATOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json new file mode 100644 index 0000000000..6af03f7f9e --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR", + "name": "BattleFrontier_BattleTowerElevator", + "layout": "LAYOUT_BATTLE_ELEVATOR", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc deleted file mode 100644 index ddf573eb2d..0000000000 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -BattleFrontier_BattleTowerLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER - object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 - object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 - -BattleFrontier_BattleTowerLobby_MapWarps: - warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - -BattleFrontier_BattleTowerLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 - bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 - bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 - bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012 - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE - -BattleFrontier_BattleTowerLobby_MapEvents:: - map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc deleted file mode 100644 index b1ca3914a0..0000000000 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerLobby: - .4byte BattleFrontier_BattleTowerLobby_Layout - .4byte BattleFrontier_BattleTowerLobby_MapEvents - .4byte BattleFrontier_BattleTowerLobby_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json new file mode 100644 index 0000000000..4773d78ed5 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "name": "BattleFrontier_BattleTowerLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 17, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 15, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96", + "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EventScript_Apprentice", + "flag": "FLAG_HIDE_APPRENTICE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFC7" + }, + { + "type": "sign", + "x": 8, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFE0" + }, + { + "type": "sign", + "x": 12, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFF9" + }, + { + "type": "sign", + "x": 16, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23F012" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc deleted file mode 100644 index d7dfcd3ad2..0000000000 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 - -BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: - map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc deleted file mode 100644 index d8fc1abb69..0000000000 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom: - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json new file mode 100644 index 0000000000..2a9726fc0d --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerMultiBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 17, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc deleted file mode 100644 index 7fb5e62565..0000000000 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge1_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 - -BattleFrontier_Lounge1_MapWarps: - warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge1_MapEvents:: - map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc deleted file mode 100644 index 69119443dd..0000000000 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge1: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge1_MapEvents - .4byte BattleFrontier_Lounge1_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json new file mode 100644 index 0000000000..3f6b1681ee --- /dev/null +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE1", + "name": "BattleFrontier_Lounge1", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E775", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 7, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E94D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E956", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc deleted file mode 100644 index faa0a5608b..0000000000 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_Lounge2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 - -BattleFrontier_Lounge2_MapWarps: - warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge2_MapEvents:: - map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc deleted file mode 100644 index a74f85ca41..0000000000 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge2: - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_Lounge2_MapEvents - .4byte BattleFrontier_Lounge2_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json new file mode 100644 index 0000000000..bade814621 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE2", + "name": "BattleFrontier_Lounge2", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260643", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_26073C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260747", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_26075D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260752", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc deleted file mode 100644 index f8a26e4ddc..0000000000 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Lounge3_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 - -BattleFrontier_Lounge3_MapWarps: - warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge3_MapEvents:: - map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc deleted file mode 100644 index fb27b1580c..0000000000 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge3: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge3_MapEvents - .4byte BattleFrontier_Lounge3_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json new file mode 100644 index 0000000000..592f65a7b0 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE3", + "name": "BattleFrontier_Lounge3", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261D83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FC1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FD1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FB8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc deleted file mode 100644 index c2e2f44a26..0000000000 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 - object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 - -BattleFrontier_Lounge4_MapWarps: - warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge4_MapEvents:: - map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc deleted file mode 100644 index edb6171e79..0000000000 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge4: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge4_MapEvents - .4byte BattleFrontier_Lounge4_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json new file mode 100644 index 0000000000..9165d21fbb --- /dev/null +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE4", + "name": "BattleFrontier_Lounge4", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_26358D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 6, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_263596", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 0, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_26359F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc deleted file mode 100644 index e0a2ea3447..0000000000 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Lounge5_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 - -BattleFrontier_Lounge5_MapWarps: - warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge5_MapEvents:: - map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc deleted file mode 100644 index 9c9de0e3b9..0000000000 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge5: - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_Lounge5_MapEvents - .4byte BattleFrontier_Lounge5_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json new file mode 100644 index 0000000000..500b0fb717 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE5", + "name": "BattleFrontier_Lounge5", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 12, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_2645C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264617", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264620", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 11, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264629", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc deleted file mode 100644 index 8c3950d61a..0000000000 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BattleFrontier_Lounge6_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 - -BattleFrontier_Lounge6_MapWarps: - warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge6_MapEvents:: - map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc deleted file mode 100644 index 2b5f8474f3..0000000000 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge6: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge6_MapEvents - .4byte BattleFrontier_Lounge6_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json new file mode 100644 index 0000000000..0b48dbbcfd --- /dev/null +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE6", + "name": "BattleFrontier_Lounge6", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 2, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge6_EventScript_264FED", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc deleted file mode 100644 index bc7f289adc..0000000000 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_Lounge7_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 - -BattleFrontier_Lounge7_MapWarps: - warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge7_MapEvents:: - map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc deleted file mode 100644 index 58b9dc3e5b..0000000000 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge7: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge7_MapEvents - .4byte BattleFrontier_Lounge7_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json new file mode 100644 index 0000000000..28fd390f7d --- /dev/null +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE7", + "name": "BattleFrontier_Lounge7", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 0, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_2656DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 2, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_265255", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_265445", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 8, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_2656E4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc deleted file mode 100644 index 47e8e51f1d..0000000000 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge8_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 - -BattleFrontier_Lounge8_MapWarps: - warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge8_MapEvents:: - map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc deleted file mode 100644 index 578219cc4f..0000000000 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge8: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge8_MapEvents - .4byte BattleFrontier_Lounge8_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json new file mode 100644 index 0000000000..13cf5e2546 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE8", + "name": "BattleFrontier_Lounge8", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676D3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc deleted file mode 100644 index ce86367cf8..0000000000 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_Lounge9_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_Lounge9_MapWarps: - warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge9_MapEvents:: - map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc deleted file mode 100644 index 32b1512efd..0000000000 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge9: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge9_MapEvents - .4byte BattleFrontier_Lounge9_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json new file mode 100644 index 0000000000..3d4faf383c --- /dev/null +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE9", + "name": "BattleFrontier_Lounge9", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 6, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 11 + }, + { + "x": 2, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc deleted file mode 100644 index e637b489b5..0000000000 --- a/data/maps/BattleFrontier_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 - -BattleFrontier_Mart_MapWarps: - warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Mart_MapEvents:: - map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc deleted file mode 100644 index 97251160fd..0000000000 --- a/data/maps/BattleFrontier_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Mart: - .4byte Mart_Layout - .4byte BattleFrontier_Mart_MapEvents - .4byte BattleFrontier_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json new file mode 100644 index 0000000000..068a46b727 --- /dev/null +++ b/data/maps/BattleFrontier_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_BATTLE_FRONTIER_MART", + "name": "BattleFrontier_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267ACC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B0B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B02", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B20", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc deleted file mode 100644 index e042da23e8..0000000000 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -BattleFrontier_OutsideEast_MapConnectionsList: - connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_OutsideEast_MapConnections: - .4byte 1 - .4byte BattleFrontier_OutsideEast_MapConnectionsList - diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc deleted file mode 100644 index b5ee58e49a..0000000000 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ /dev/null @@ -1,57 +0,0 @@ -BattleFrontier_OutsideEast_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 - object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 - object_event 9, EVENT_OBJ_GFX_RICH_BOY, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 - object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 - object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 - object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 - object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 - object_event 18, EVENT_OBJ_GFX_MAN_3, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 - object_event 24, EVENT_OBJ_GFX_OLD_WOMAN, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 - object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 - -BattleFrontier_OutsideEast_MapWarps: - warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 58, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - warp_def 35, 12, 3, 0, MAP_BATTLE_FRONTIER_RANKING_HALL - warp_def 4, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE1 - warp_def 10, 28, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - warp_def 22, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE5 - warp_def 5, 8, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE6 - warp_def 65, 31, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE3 - warp_def 14, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE8 - warp_def 21, 45, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE9 - warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F - -BattleFrontier_OutsideEast_MapBGEvents: - bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43 - bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C - bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55 - bg_event 62, 15, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C5E - bg_event 7, 29, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DD7 - bg_event 32, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DCE - bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 - bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 - -BattleFrontier_OutsideEast_MapEvents:: - map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents - diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc deleted file mode 100644 index 72e10d0dd9..0000000000 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideEast: - .4byte BattleFrontier_OutsideEast_Layout - .4byte BattleFrontier_OutsideEast_MapEvents - .4byte BattleFrontier_OutsideEast_MapScripts - .4byte BattleFrontier_OutsideEast_MapConnections - .2byte MUS_B_FRONTIER - .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json new file mode 100644 index 0000000000..700c24aff9 --- /dev/null +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -0,0 +1,529 @@ +{ + "id": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "name": "BattleFrontier_OutsideEast", + "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST", + "music": "MUS_B_FRONTIER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 20, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C67", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 42, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 53, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C79", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 54, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 37, + "y": 32, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 41, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 46, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CBB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 34, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 45, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CB2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 59, + "y": 35, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 6, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CC4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 18, + "y": 40, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CCD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 17, + "y": 40, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 40, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUDOWOODO", + "x": 54, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CEA", + "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 42, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D79", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 51, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 62, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 2, + "movement_range_y": 6, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 10, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D9D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 16, + "y": 30, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DA6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 33, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DAF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 54, + "y": 31, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DB8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 54, + "y": 32, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DC3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 58, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DE9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 48, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DE0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242E08", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 14, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 29, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 56, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 58, + "y": 14, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 12, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_RANKING_HALL", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE1", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 28, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE5", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE6", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 31, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE3", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE8", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 45, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE9", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 13, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C43" + }, + { + "type": "sign", + "x": 43, + "y": 56, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C4C" + }, + { + "type": "sign", + "x": 36, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C55" + }, + { + "type": "sign", + "x": 62, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C5E" + }, + { + "type": "sign", + "x": 7, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242DD7" + }, + { + "type": "sign", + "x": 32, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242DCE" + }, + { + "type": "sign", + "x": 4, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_271E73" + }, + { + "type": "sign", + "x": 5, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc deleted file mode 100644 index 0755b3c44c..0000000000 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -BattleFrontier_OutsideWest_MapConnectionsList: - connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_OutsideWest_MapConnections: - .4byte 1 - .4byte BattleFrontier_OutsideWest_MapConnectionsList - diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc deleted file mode 100644 index 87c0db7aab..0000000000 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -BattleFrontier_OutsideWest_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 - object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 - object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 - object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 - object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 - object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 - object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 - object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 - object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 - object_event 22, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 - object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 - object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 - -BattleFrontier_OutsideWest_MapWarps: - warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY - warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - warp_def 45, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE2 - warp_def 51, 51, 0, 0, MAP_BATTLE_FRONTIER_MART - warp_def 44, 5, 0, 0, MAP_BATTLE_FRONTIER_SCOTTS_HOUSE - warp_def 53, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE4 - warp_def 5, 20, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE7 - warp_def 26, 65, 0, 0, MAP_BATTLE_FRONTIER_RECEPTION_GATE - warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE - warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F - -BattleFrontier_OutsideWest_MapBGEvents: - bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2 - bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4 - bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB - bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A - bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A - -BattleFrontier_OutsideWest_MapEvents:: - map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents - diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc deleted file mode 100644 index 40f26c1518..0000000000 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideWest: - .4byte BattleFrontier_OutsideWest_Layout - .4byte BattleFrontier_OutsideWest_MapEvents - .4byte BattleFrontier_OutsideWest_MapScripts - .4byte BattleFrontier_OutsideWest_MapConnections - .2byte MUS_B_FRONTIER - .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json new file mode 100644 index 0000000000..43298e6635 --- /dev/null +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -0,0 +1,458 @@ +{ + "id": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "name": "BattleFrontier_OutsideWest", + "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST", + "music": "MUS_B_FRONTIER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": 0, + "map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 26, + "y": 38, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D50F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 20, + "y": 70, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 19, + "y": 68, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D3F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 26, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 8, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D68B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 27, + "y": 30, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D52D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 33, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D69D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 28, + "y": 43, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6A6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 17, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D679", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 13, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D536", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D53D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 23, + "y": 47, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D694", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 38, + "y": 27, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D5C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 45, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D635", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 9, + "y": 47, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D57F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 35, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D682", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 11, + "y": 66, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_249E19", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 31, + "y": 31, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D667", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 42, + "y": 48, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 38, + "y": 22, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 12, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 11, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 26, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6EE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 42, + "y": 27, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 17, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 38, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE2", + "dest_warp_id": 0 + }, + { + "x": 51, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_MART", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 5, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 53, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE4", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 20, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE7", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 65, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 61, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 55, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4E2" + }, + { + "type": "sign", + "x": 45, + "y": 30, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4F4" + }, + { + "type": "sign", + "x": 16, + "y": 43, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4EB" + }, + { + "type": "sign", + "x": 52, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + }, + { + "type": "sign", + "x": 53, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc deleted file mode 100644 index 20bad9c6da..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 - object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 - -BattleFrontier_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F - -BattleFrontier_PokemonCenter_1F_MapEvents:: - map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc deleted file mode 100644 index 65445c2a17..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte BattleFrontier_PokemonCenter_1F_MapEvents - .4byte BattleFrontier_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..4a78ec120d --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "name": "BattleFrontier_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 12 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 12 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc deleted file mode 100644 index d2f3730e89..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -BattleFrontier_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -BattleFrontier_PokemonCenter_2F_MapEvents:: - map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc deleted file mode 100644 index fbd39cde9e..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte BattleFrontier_PokemonCenter_2F_MapEvents - .4byte BattleFrontier_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..1f3babd48d --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", + "name": "BattleFrontier_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc deleted file mode 100644 index 30a0e5ebb3..0000000000 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -BattleFrontier_RankingHall_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 - -BattleFrontier_RankingHall_MapWarps: - warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_RankingHall_MapBGEvents: - bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA - bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 - bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 - bg_event 29, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4CE - bg_event 42, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4DA - bg_event 46, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4E6 - bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4F2 - bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4FE - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E50A - bg_event 44, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E516 - bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 - bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 - -BattleFrontier_RankingHall_MapEvents:: - map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents - diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc deleted file mode 100644 index 0f001d5637..0000000000 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_RankingHall: - .4byte BattleFrontier_RankingHall_Layout - .4byte BattleFrontier_RankingHall_MapEvents - .4byte BattleFrontier_RankingHall_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_BATTLE_FRONTIER_RANKING_HALL - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json new file mode 100644 index 0000000000..64fa727d72 --- /dev/null +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_BATTLE_FRONTIER_RANKING_HALL", + "name": "BattleFrontier_RankingHall", + "layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E52F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E54A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 44, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E573", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 26, + "y": 14, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 4 + }, + { + "x": 27, + "y": 14, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 26, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4AA" + }, + { + "type": "sign", + "x": 23, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4B6" + }, + { + "type": "sign", + "x": 26, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4C2" + }, + { + "type": "sign", + "x": 29, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4CE" + }, + { + "type": "sign", + "x": 42, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4DA" + }, + { + "type": "sign", + "x": 46, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4E6" + }, + { + "type": "sign", + "x": 10, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4F2" + }, + { + "type": "sign", + "x": 8, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4FE" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E50A" + }, + { + "type": "sign", + "x": 44, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E516" + }, + { + "type": "sign", + "x": 16, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_RankingHall_EventScript_25E538" + }, + { + "type": "sign", + "x": 36, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_RankingHall_EventScript_25E541" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc deleted file mode 100644 index c1e55ad870..0000000000 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_ReceptionGate_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 - object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 - -BattleFrontier_ReceptionGate_MapWarps: - warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_ReceptionGate_MapEvents:: - map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc deleted file mode 100644 index 46a55a6b1c..0000000000 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ReceptionGate: - .4byte BattleFrontier_ReceptionGate_Layout - .4byte BattleFrontier_ReceptionGate_MapEvents - .4byte BattleFrontier_ReceptionGate_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json new file mode 100644 index 0000000000..ffde653f74 --- /dev/null +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "name": "BattleFrontier_ReceptionGate", + "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_2662FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 8, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_266310", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_266436", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_2664F4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 13, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc deleted file mode 100644 index acb02c4d8f..0000000000 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_ScottsHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 - -BattleFrontier_ScottsHouse_MapWarps: - warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_ScottsHouse_MapEvents:: - map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc deleted file mode 100644 index ff41a82e33..0000000000 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ScottsHouse: - .4byte BattleFrontier_ScottsHouse_Layout - .4byte BattleFrontier_ScottsHouse_MapEvents - .4byte BattleFrontier_ScottsHouse_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json new file mode 100644 index 0000000000..aa6003a862 --- /dev/null +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", + "name": "BattleFrontier_ScottsHouse", + "layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ScottsHouse_EventScript_2636A8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 5 + }, + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc deleted file mode 100644 index bcc81b36cc..0000000000 --- a/data/maps/BattlePyramidSquare01/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare01_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare01_MapEvents:: - map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc deleted file mode 100644 index e63919e43e..0000000000 --- a/data/maps/BattlePyramidSquare01/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare01: - .4byte BattlePyramidSquare01_Layout - .4byte BattlePyramidSquare01_MapEvents - .4byte BattlePyramidSquare01_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE01 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json new file mode 100644 index 0000000000..38320ece64 --- /dev/null +++ b/data/maps/BattlePyramidSquare01/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE01", + "name": "BattlePyramidSquare01", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc deleted file mode 100644 index 978c559825..0000000000 --- a/data/maps/BattlePyramidSquare02/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare02_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare02_MapEvents:: - map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc deleted file mode 100644 index 61a1272cf4..0000000000 --- a/data/maps/BattlePyramidSquare02/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare02: - .4byte BattlePyramidSquare02_Layout - .4byte BattlePyramidSquare02_MapEvents - .4byte BattlePyramidSquare02_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE02 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json new file mode 100644 index 0000000000..0dc6f713a0 --- /dev/null +++ b/data/maps/BattlePyramidSquare02/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE02", + "name": "BattlePyramidSquare02", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 5, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 5, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc deleted file mode 100644 index 339010e8a3..0000000000 --- a/data/maps/BattlePyramidSquare03/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare03_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare03_MapEvents:: - map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc deleted file mode 100644 index ef7663ed0c..0000000000 --- a/data/maps/BattlePyramidSquare03/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare03: - .4byte BattlePyramidSquare03_Layout - .4byte BattlePyramidSquare03_MapEvents - .4byte BattlePyramidSquare03_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE03 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json new file mode 100644 index 0000000000..4e446e24b9 --- /dev/null +++ b/data/maps/BattlePyramidSquare03/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE03", + "name": "BattlePyramidSquare03", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 6, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 3, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc deleted file mode 100644 index 4c4cf7df10..0000000000 --- a/data/maps/BattlePyramidSquare04/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare04_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare04_MapEvents:: - map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc deleted file mode 100644 index 7525f2b047..0000000000 --- a/data/maps/BattlePyramidSquare04/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare04: - .4byte BattlePyramidSquare04_Layout - .4byte BattlePyramidSquare04_MapEvents - .4byte BattlePyramidSquare04_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE04 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json new file mode 100644 index 0000000000..67dfdaa11c --- /dev/null +++ b/data/maps/BattlePyramidSquare04/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE04", + "name": "BattlePyramidSquare04", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 1, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc deleted file mode 100644 index fe794509b2..0000000000 --- a/data/maps/BattlePyramidSquare05/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare05_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare05_MapEvents:: - map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc deleted file mode 100644 index 673d29e253..0000000000 --- a/data/maps/BattlePyramidSquare05/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare05: - .4byte BattlePyramidSquare05_Layout - .4byte BattlePyramidSquare05_MapEvents - .4byte BattlePyramidSquare05_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE05 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json new file mode 100644 index 0000000000..ac8bd5d7d5 --- /dev/null +++ b/data/maps/BattlePyramidSquare05/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE05", + "name": "BattlePyramidSquare05", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 3, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 3, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc deleted file mode 100644 index a7a1776e74..0000000000 --- a/data/maps/BattlePyramidSquare06/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare06_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare06_MapEvents:: - map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc deleted file mode 100644 index 2487c4a94b..0000000000 --- a/data/maps/BattlePyramidSquare06/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare06: - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare06_MapEvents - .4byte BattlePyramidSquare06_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json new file mode 100644 index 0000000000..d9fa40ccd0 --- /dev/null +++ b/data/maps/BattlePyramidSquare06/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE06", + "name": "BattlePyramidSquare06", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc deleted file mode 100644 index 85e9876264..0000000000 --- a/data/maps/BattlePyramidSquare07/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare07_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare07_MapEvents:: - map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc deleted file mode 100644 index aa31ddcb0a..0000000000 --- a/data/maps/BattlePyramidSquare07/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare07: - .4byte BattlePyramidSquare07_Layout - .4byte BattlePyramidSquare07_MapEvents - .4byte BattlePyramidSquare07_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE07 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json new file mode 100644 index 0000000000..a097f60ba2 --- /dev/null +++ b/data/maps/BattlePyramidSquare07/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE07", + "name": "BattlePyramidSquare07", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 0, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 4, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 4, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc deleted file mode 100644 index dac62da218..0000000000 --- a/data/maps/BattlePyramidSquare08/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare08_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare08_MapEvents:: - map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc deleted file mode 100644 index f579f958ba..0000000000 --- a/data/maps/BattlePyramidSquare08/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare08: - .4byte BattlePyramidSquare08_Layout - .4byte BattlePyramidSquare08_MapEvents - .4byte BattlePyramidSquare08_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE08 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json new file mode 100644 index 0000000000..6939b8a7e4 --- /dev/null +++ b/data/maps/BattlePyramidSquare08/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE08", + "name": "BattlePyramidSquare08", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc deleted file mode 100644 index 17a4a1e383..0000000000 --- a/data/maps/BattlePyramidSquare09/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare09_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare09_MapEvents:: - map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc deleted file mode 100644 index 6dac1b9fe9..0000000000 --- a/data/maps/BattlePyramidSquare09/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare09: - .4byte BattlePyramidSquare09_Layout - .4byte BattlePyramidSquare09_MapEvents - .4byte BattlePyramidSquare09_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE09 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json new file mode 100644 index 0000000000..56380e9914 --- /dev/null +++ b/data/maps/BattlePyramidSquare09/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE09", + "name": "BattlePyramidSquare09", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 3, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc deleted file mode 100644 index f172155f9f..0000000000 --- a/data/maps/BattlePyramidSquare10/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare10_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare10_MapEvents:: - map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc deleted file mode 100644 index ac899c718b..0000000000 --- a/data/maps/BattlePyramidSquare10/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare10: - .4byte BattlePyramidSquare10_Layout - .4byte BattlePyramidSquare10_MapEvents - .4byte BattlePyramidSquare10_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE10 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json new file mode 100644 index 0000000000..33534391bf --- /dev/null +++ b/data/maps/BattlePyramidSquare10/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE10", + "name": "BattlePyramidSquare10", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc deleted file mode 100644 index 60c5e0e2de..0000000000 --- a/data/maps/BattlePyramidSquare11/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare11_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare11_MapEvents:: - map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc deleted file mode 100644 index ca560a4a70..0000000000 --- a/data/maps/BattlePyramidSquare11/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare11: - .4byte BattlePyramidSquare11_Layout - .4byte BattlePyramidSquare11_MapEvents - .4byte BattlePyramidSquare11_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE11 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json new file mode 100644 index 0000000000..f22855aa24 --- /dev/null +++ b/data/maps/BattlePyramidSquare11/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE11", + "name": "BattlePyramidSquare11", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc deleted file mode 100644 index 7c650b972c..0000000000 --- a/data/maps/BattlePyramidSquare12/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare12_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare12_MapEvents:: - map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc deleted file mode 100644 index 59793abe7e..0000000000 --- a/data/maps/BattlePyramidSquare12/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare12: - .4byte BattlePyramidSquare12_Layout - .4byte BattlePyramidSquare12_MapEvents - .4byte BattlePyramidSquare12_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE12 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json new file mode 100644 index 0000000000..d8e0d45a9c --- /dev/null +++ b/data/maps/BattlePyramidSquare12/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE12", + "name": "BattlePyramidSquare12", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc deleted file mode 100644 index 90d427f2dc..0000000000 --- a/data/maps/BattlePyramidSquare13/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare13_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare13_MapEvents:: - map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc deleted file mode 100644 index d0012926c5..0000000000 --- a/data/maps/BattlePyramidSquare13/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare13: - .4byte BattlePyramidSquare13_Layout - .4byte BattlePyramidSquare13_MapEvents - .4byte BattlePyramidSquare13_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE13 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json new file mode 100644 index 0000000000..880178e0e3 --- /dev/null +++ b/data/maps/BattlePyramidSquare13/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE13", + "name": "BattlePyramidSquare13", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc deleted file mode 100644 index 80f28a83ab..0000000000 --- a/data/maps/BattlePyramidSquare14/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare14_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare14_MapEvents:: - map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc deleted file mode 100644 index 049d9ec94d..0000000000 --- a/data/maps/BattlePyramidSquare14/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare14: - .4byte BattlePyramidSquare14_Layout - .4byte BattlePyramidSquare14_MapEvents - .4byte BattlePyramidSquare14_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE14 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json new file mode 100644 index 0000000000..423346532a --- /dev/null +++ b/data/maps/BattlePyramidSquare14/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE14", + "name": "BattlePyramidSquare14", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc deleted file mode 100644 index 3781ec3dbf..0000000000 --- a/data/maps/BattlePyramidSquare15/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare15_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare15_MapEvents:: - map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc deleted file mode 100644 index 980402c21b..0000000000 --- a/data/maps/BattlePyramidSquare15/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare15: - .4byte BattlePyramidSquare15_Layout - .4byte BattlePyramidSquare15_MapEvents - .4byte BattlePyramidSquare15_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE15 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json new file mode 100644 index 0000000000..12b1f4cb8c --- /dev/null +++ b/data/maps/BattlePyramidSquare15/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE15", + "name": "BattlePyramidSquare15", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc deleted file mode 100644 index 973d7c0ef1..0000000000 --- a/data/maps/BattlePyramidSquare16/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare16_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare16_MapEvents:: - map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc deleted file mode 100644 index b51e9692c1..0000000000 --- a/data/maps/BattlePyramidSquare16/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare16: - .4byte BattlePyramidSquare16_Layout - .4byte BattlePyramidSquare16_MapEvents - .4byte BattlePyramidSquare16_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE16 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json new file mode 100644 index 0000000000..65fa0a361d --- /dev/null +++ b/data/maps/BattlePyramidSquare16/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE16", + "name": "BattlePyramidSquare16", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc deleted file mode 100644 index daf780f739..0000000000 --- a/data/maps/BirthIsland_Exterior/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BirthIsland_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS - -BirthIsland_Exterior_MapWarps: - warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR - -BirthIsland_Exterior_MapEvents:: - map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc deleted file mode 100644 index 71af6d880e..0000000000 --- a/data/maps/BirthIsland_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Exterior: - .4byte BirthIsland_Exterior_Layout - .4byte BirthIsland_Exterior_MapEvents - .4byte BirthIsland_Exterior_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BIRTH_ISLAND_EXTERIOR - .byte MAPSEC_BIRTH_ISLAND_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json new file mode 100644 index 0000000000..43ffc5d44f --- /dev/null +++ b/data/maps/BirthIsland_Exterior/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior", + "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "music": "65535", + "region_map_section": "MAPSEC_BIRTH_ISLAND_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEOXYS_TRIANGLE", + "x": 15, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Exterior_EventScript_267F83", + "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEOXYS", + "x": 15, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_DEOXYS" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 0, + "dest_map": "MAP_BIRTH_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc deleted file mode 100644 index 1cbef28746..0000000000 --- a/data/maps/BirthIsland_Harbor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BirthIsland_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -BirthIsland_Harbor_MapWarps: - warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR - -BirthIsland_Harbor_MapEvents:: - map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc deleted file mode 100644 index e3b3d53b29..0000000000 --- a/data/maps/BirthIsland_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Harbor: - .4byte IslandHarbor_Layout - .4byte BirthIsland_Harbor_MapEvents - .4byte BirthIsland_Harbor_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_ISLAND_HARBOR - .byte MAPSEC_BIRTH_ISLAND_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json new file mode 100644 index 0000000000..f55cf8e930 --- /dev/null +++ b/data/maps/BirthIsland_Harbor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_BIRTH_ISLAND_HARBOR", + "name": "BirthIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "65535", + "region_map_section": "MAPSEC_BIRTH_ISLAND_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Harbor_EventScript_26805D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc deleted file mode 100644 index 098938279f..0000000000 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_1F_MapWarps: - warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE - warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F - -CaveOfOrigin_1F_MapEvents:: - map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc deleted file mode 100644 index df0e323d09..0000000000 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_1F: - .4byte CaveOfOrigin_1F_Layout - .4byte CaveOfOrigin_1F_MapEvents - .4byte CaveOfOrigin_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_1F - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json new file mode 100644 index 0000000000..989b1cf305 --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_1F", + "name": "CaveOfOrigin_1F", + "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 17, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc deleted file mode 100644 index 0028301c95..0000000000 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -CaveOfOrigin_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE - -CaveOfOrigin_B1F_MapWarps: - warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F - -CaveOfOrigin_B1F_MapEvents:: - map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc deleted file mode 100644 index 200c90bfdc..0000000000 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_B1F: - .4byte CaveOfOrigin_B1F_Layout - .4byte CaveOfOrigin_B1F_MapEvents - .4byte CaveOfOrigin_B1F_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_CAVE_OF_ORIGIN_B1F - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json new file mode 100644 index 0000000000..f8c5848454 --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_B1F", + "name": "CaveOfOrigin_B1F", + "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", + "music": "65535", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 9, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CaveOfOrigin_B1F_EventScript_2357A9", + "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE" + } + ], + "warp_events": [ + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc deleted file mode 100644 index 235e4afa0f..0000000000 --- a/data/maps/CaveOfOrigin_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_Entrance_MapWarps: - warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY - warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F - -CaveOfOrigin_Entrance_MapEvents:: - map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc deleted file mode 100644 index afbbd0312e..0000000000 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_Entrance: - .4byte CaveOfOrigin_Entrance_Layout - .4byte CaveOfOrigin_Entrance_MapEvents - .4byte CaveOfOrigin_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_ENTRANCE - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json new file mode 100644 index 0000000000..07c7af816d --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "name": "CaveOfOrigin_Entrance", + "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 3 + }, + { + "x": 9, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc deleted file mode 100644 index eeb07e63af..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: - warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - -CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc deleted file mode 100644 index e0fea7bd5e..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1: - .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json new file mode 100644 index 0000000000..e131e4f0c7 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "name": "CaveOfOrigin_UnusedRubySapphireMap1", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 11, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc deleted file mode 100644 index 1a8e841b78..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: - 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:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc deleted file mode 100644 index e8e7c0c793..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2: - .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json new file mode 100644 index 0000000000..8b83029e3a --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "name": "CaveOfOrigin_UnusedRubySapphireMap2", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc deleted file mode 100644 index e1cacec432..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: - 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:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc deleted file mode 100644 index ec55cb0ffb..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3: - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json new file mode 100644 index 0000000000..2b7c6db194 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "name": "CaveOfOrigin_UnusedRubySapphireMap3", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc deleted file mode 100644 index 88dad2c289..0000000000 --- a/data/maps/DesertRuins/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -DesertRuins_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK - -DesertRuins_MapWarps: - warp_def 8, 29, 3, 1, MAP_ROUTE111 - warp_def 8, 20, 0, 2, MAP_DESERT_RUINS - warp_def 8, 11, 3, 1, MAP_DESERT_RUINS - -DesertRuins_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 - -DesertRuins_MapEvents:: - map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents - diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc deleted file mode 100644 index f0af5f2e05..0000000000 --- a/data/maps/DesertRuins/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertRuins: - .4byte DesertRuins_Layout - .4byte DesertRuins_MapEvents - .4byte DesertRuins_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_DESERT_RUINS - .byte MAPSEC_DESERT_RUINS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json new file mode 100644 index 0000000000..439611a39b --- /dev/null +++ b/data/maps/DesertRuins/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_DESERT_RUINS", + "name": "DesertRuins", + "layout": "LAYOUT_DESERT_RUINS", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_DESERT_RUINS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DesertRuins_EventScript_22DA02", + "flag": "FLAG_HIDE_REGIROCK" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9DB" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9F8" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9F8" + } + ] +} \ No newline at end of file diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc deleted file mode 100644 index 25497be276..0000000000 --- a/data/maps/DesertUnderpass/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -DesertUnderpass_EventObjects: - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - -DesertUnderpass_MapWarps: - warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL - -DesertUnderpass_MapEvents:: - map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc deleted file mode 100644 index ca7ab5254a..0000000000 --- a/data/maps/DesertUnderpass/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertUnderpass: - .4byte DesertUnderpass_Layout - .4byte DesertUnderpass_MapEvents - .4byte DesertUnderpass_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_DESERT_UNDERPASS - .byte MAPSEC_DESERT_UNDERPASS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json new file mode 100644 index 0000000000..3a16f2c5d1 --- /dev/null +++ b/data/maps/DesertUnderpass/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_DESERT_UNDERPASS", + "name": "DesertUnderpass", + "layout": "LAYOUT_DESERT_UNDERPASS", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_DESERT_UNDERPASS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 132, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DesertUnderpass_EventScript_23AF41", + "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" + } + ], + "warp_events": [ + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc deleted file mode 100644 index 294bf9956a..0000000000 --- a/data/maps/DewfordTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -DewfordTown_MapConnectionsList: - connection up, -60, MAP_ROUTE106 - connection right, 0, MAP_ROUTE107 - -DewfordTown_MapConnections: - .4byte 2 - .4byte DewfordTown_MapConnectionsList - diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc deleted file mode 100644 index 0b9036029f..0000000000 --- a/data/maps/DewfordTown/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -DewfordTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 - -DewfordTown_MapWarps: - warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL - warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM - warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 - warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 - -DewfordTown_MapBGEvents: - bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA - bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3 - bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 - bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 - bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC - -DewfordTown_MapEvents:: - map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents - diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc deleted file mode 100644 index 03c5b689b4..0000000000 --- a/data/maps/DewfordTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown: - .4byte DewfordTown_Layout - .4byte DewfordTown_MapEvents - .4byte DewfordTown_MapScripts - .4byte DewfordTown_MapConnections - .2byte MUS_HIGHTOWN - .2byte LAYOUT_DEWFORD_TOWN - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json new file mode 100644 index 0000000000..64e70fe7fd --- /dev/null +++ b/data/maps/DewfordTown/map.json @@ -0,0 +1,174 @@ +{ + "id": "MAP_DEWFORD_TOWN", + "name": "DewfordTown", + "layout": "LAYOUT_DEWFORD_TOWN", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -60, + "map": "MAP_ROUTE106" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE107" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E95B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_EventScript_1E9511", + "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E95D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 12, + "y": 8, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E9922", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HALL", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 10, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 17, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_GYM", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 14, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95BA" + }, + { + "type": "sign", + "x": 11, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95C3" + }, + { + "type": "sign", + "x": 4, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 3, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 2, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95CC" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc deleted file mode 100644 index c3b718f194..0000000000 --- a/data/maps/DewfordTown_Gym/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -DewfordTown_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 - object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 - -DewfordTown_Gym_MapWarps: - warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN - warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN - -DewfordTown_Gym_MapBGEvents: - bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 - bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 - -DewfordTown_Gym_MapEvents:: - map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents - diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc deleted file mode 100644 index 72b93573b7..0000000000 --- a/data/maps/DewfordTown_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Gym: - .4byte DewfordTown_Gym_Layout - .4byte DewfordTown_Gym_MapEvents - .4byte DewfordTown_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_DEWFORD_TOWN_GYM - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json new file mode 100644 index 0000000000..e42e4ffe8b --- /dev/null +++ b/data/maps/DewfordTown_Gym/map.json @@ -0,0 +1,173 @@ +{ + "id": "MAP_DEWFORD_TOWN_GYM", + "name": "DewfordTown_Gym", + "layout": "LAYOUT_DEWFORD_TOWN_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "x": 4, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Gym_EventScript_1FC7C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC8B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC8D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "DewfordTown_Gym_EventScript_1FC8FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 5, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Gym_EventScript_1FC983", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 8, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC93F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC961", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 14, + "y": 12, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "DewfordTown_Gym_EventScript_1FC91D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 27, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 27, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9A2" + }, + { + "type": "sign", + "x": 7, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9B2" + }, + { + "type": "sign", + "x": 4, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9A2" + }, + { + "type": "sign", + "x": 7, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9B2" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc deleted file mode 100644 index 7fc332f90a..0000000000 --- a/data/maps/DewfordTown_Hall/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -DewfordTown_Hall_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 - object_event 5, EVENT_OBJ_GFX_TWIN, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - -DewfordTown_Hall_MapWarps: - warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN - warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN - -DewfordTown_Hall_MapBGEvents: - bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590 - bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0 - -DewfordTown_Hall_MapEvents:: - map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents - diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc deleted file mode 100644 index 4fc39cf215..0000000000 --- a/data/maps/DewfordTown_Hall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Hall: - .4byte DewfordTown_Hall_Layout - .4byte DewfordTown_Hall_MapEvents - .4byte DewfordTown_Hall_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_DEWFORD_TOWN_HALL - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json new file mode 100644 index 0000000000..f6a8dac7ba --- /dev/null +++ b/data/maps/DewfordTown_Hall/map.json @@ -0,0 +1,170 @@ +{ + "id": "MAP_DEWFORD_TOWN_HALL", + "name": "DewfordTown_Hall", + "layout": "LAYOUT_DEWFORD_TOWN_HALL", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD4D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD4F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD50A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD547", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD563", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 14, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD57F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD62F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD63B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD7DA", + "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_Hall_EventScript_1FD590" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_Hall_EventScript_1FD5A0" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc deleted file mode 100644 index a9c8b0ae5f..0000000000 --- a/data/maps/DewfordTown_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -DewfordTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 - -DewfordTown_House1_MapWarps: - warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN - warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN - -DewfordTown_House1_MapEvents:: - map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc deleted file mode 100644 index 9f4eec0325..0000000000 --- a/data/maps/DewfordTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_House1: - .4byte House3_Layout - .4byte DewfordTown_House1_MapEvents - .4byte DewfordTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json new file mode 100644 index 0000000000..fbc3e02ed1 --- /dev/null +++ b/data/maps/DewfordTown_House1/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_DEWFORD_TOWN_HOUSE1", + "name": "DewfordTown_House1", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3E0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc deleted file mode 100644 index 9f3801afac..0000000000 --- a/data/maps/DewfordTown_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -DewfordTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 - -DewfordTown_House2_MapWarps: - warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN - warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN - -DewfordTown_House2_MapEvents:: - map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc deleted file mode 100644 index ec8359b68d..0000000000 --- a/data/maps/DewfordTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_House2: - .4byte House4_Layout - .4byte DewfordTown_House2_MapEvents - .4byte DewfordTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_HOUSE4 - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json new file mode 100644 index 0000000000..742fde7064 --- /dev/null +++ b/data/maps/DewfordTown_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_DEWFORD_TOWN_HOUSE2", + "name": "DewfordTown_House2", + "layout": "LAYOUT_HOUSE4", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House2_EventScript_1FE22E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House2_EventScript_1FE271", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 86c42ffab3..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -DewfordTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 - -DewfordTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN - warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN - warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F - -DewfordTown_PokemonCenter_1F_MapEvents:: - map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc deleted file mode 100644 index b6aa6f7917..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte DewfordTown_PokemonCenter_1F_MapEvents - .4byte DewfordTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..137b9f5e9a --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "name": "DewfordTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc deleted file mode 100644 index eccedade46..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -DewfordTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -DewfordTown_PokemonCenter_2F_MapEvents:: - map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 8bb0d81d70..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte DewfordTown_PokemonCenter_2F_MapEvents - .4byte DewfordTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..e4f298d73f --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", + "name": "DewfordTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc deleted file mode 100644 index 4ea0b7f614..0000000000 --- a/data/maps/DoubleBattleColosseum/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum_MapWarps: - warp_def 5, 8, 3, 127, MAP_NONE - warp_def 6, 8, 3, 127, MAP_NONE - warp_def 7, 8, 3, 127, MAP_NONE - warp_def 8, 8, 3, 127, MAP_NONE - -DoubleBattleColosseum_MapCoordEvents: - coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388 - coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE - coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3 - coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9 - -DoubleBattleColosseum_MapEvents:: - map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc deleted file mode 100644 index df679a9180..0000000000 --- a/data/maps/DoubleBattleColosseum/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum: - .4byte DoubleBattleColosseum_Layout - .4byte DoubleBattleColosseum_MapEvents - .4byte DoubleBattleColosseum_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_DOUBLE_BATTLE_COLOSSEUM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json new file mode 100644 index 0000000000..c0cd887613 --- /dev/null +++ b/data/maps/DoubleBattleColosseum/map.json @@ -0,0 +1,86 @@ +{ + "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", + "name": "DoubleBattleColosseum", + "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277388" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773BE" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773A3" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773D9" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc deleted file mode 100644 index 78c3ba8d1b..0000000000 --- a/data/maps/EverGrandeCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -EverGrandeCity_MapConnectionsList: - connection left, 40, MAP_ROUTE128 - -EverGrandeCity_MapConnections: - .4byte 1 - .4byte EverGrandeCity_MapConnectionsList - diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc deleted file mode 100644 index 9c0cd79efe..0000000000 --- a/data/maps/EverGrandeCity/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -EverGrandeCity_MapWarps: - warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F - warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F - -EverGrandeCity_MapCoordEvents: - coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - -EverGrandeCity_MapBGEvents: - bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B - bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 - bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34 - bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D - bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 - -EverGrandeCity_MapEvents:: - map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents - diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc deleted file mode 100644 index 7350945788..0000000000 --- a/data/maps/EverGrandeCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity: - .4byte EverGrandeCity_Layout - .4byte EverGrandeCity_MapEvents - .4byte EverGrandeCity_MapScripts - .4byte EverGrandeCity_MapConnections - .2byte MUS_RAINBOW - .2byte LAYOUT_EVER_GRANDE_CITY - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json new file mode 100644 index 0000000000..4812461f7c --- /dev/null +++ b/data/maps/EverGrandeCity/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_EVER_GRANDE_CITY", + "name": "EverGrandeCity", + "layout": "LAYOUT_EVER_GRANDE_CITY", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 5, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 48, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 41, + "elevation": 0, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 27, + "elevation": 0, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 16, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 18, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 19, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 20, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 21, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 22, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 23, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 24, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 25, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 26, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 43, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D2B" + }, + { + "type": "sign", + "x": 29, + "y": 48, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EverGrandeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 18, + "y": 52, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D34" + }, + { + "type": "sign", + "x": 23, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D3D" + }, + { + "type": "sign", + "x": 28, + "y": 48, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EverGrandeCity_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc deleted file mode 100644 index 846e7f60eb..0000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_ChampionsRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH - -EverGrandeCity_ChampionsRoom_MapWarps: - 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:: - map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc deleted file mode 100644 index 0b73346855..0000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ChampionsRoom: - .4byte EverGrandeCity_ChampionsRoom_Layout - .4byte EverGrandeCity_ChampionsRoom_MapEvents - .4byte EverGrandeCity_ChampionsRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json new file mode 100644 index 0000000000..0281bebc55 --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "name": "EverGrandeCity_ChampionsRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_CHAMPIONS_ROOM_BIRCH" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL4", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc deleted file mode 100644 index 997df50453..0000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_DrakesRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 - -EverGrandeCity_DrakesRoom_MapWarps: - 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:: - map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc deleted file mode 100644 index 3c5b52b213..0000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_DrakesRoom: - .4byte EverGrandeCity_DrakesRoom_Layout - .4byte EverGrandeCity_DrakesRoom_MapEvents - .4byte EverGrandeCity_DrakesRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_DRAKE - diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json new file mode 100644 index 0000000000..92e1651e55 --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "name": "EverGrandeCity_DrakesRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_DRAKE", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL3", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc deleted file mode 100644 index abe7b85647..0000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_GlaciasRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 - -EverGrandeCity_GlaciasRoom_MapWarps: - 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:: - map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc deleted file mode 100644 index f330a321fc..0000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_GlaciasRoom: - .4byte EverGrandeCity_GlaciasRoom_Layout - .4byte EverGrandeCity_GlaciasRoom_MapEvents - .4byte EverGrandeCity_GlaciasRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GLACIA - diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json new file mode 100644 index 0000000000..7744894159 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "name": "EverGrandeCity_GlaciasRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GLACIA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_GlaciasRoom_EventScript_228469", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL2", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc deleted file mode 100644 index fd3a5584d2..0000000000 --- a/data/maps/EverGrandeCity_Hall1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall1_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - -EverGrandeCity_Hall1_MapEvents:: - map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc deleted file mode 100644 index 1e2f0f8ebd..0000000000 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall1: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall1_MapEvents - .4byte EverGrandeCity_Hall1_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json new file mode 100644 index 0000000000..1ebb9c9251 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL1", + "name": "EverGrandeCity_Hall1", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc deleted file mode 100644 index e9b8ab0561..0000000000 --- a/data/maps/EverGrandeCity_Hall2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall2_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - -EverGrandeCity_Hall2_MapEvents:: - map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc deleted file mode 100644 index 2422915425..0000000000 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall2: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall2_MapEvents - .4byte EverGrandeCity_Hall2_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json new file mode 100644 index 0000000000..0631c14f0f --- /dev/null +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL2", + "name": "EverGrandeCity_Hall2", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc deleted file mode 100644 index 3e792fd1b1..0000000000 --- a/data/maps/EverGrandeCity_Hall3/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall3_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - -EverGrandeCity_Hall3_MapEvents:: - map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc deleted file mode 100644 index fd06433450..0000000000 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall3: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall3_MapEvents - .4byte EverGrandeCity_Hall3_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json new file mode 100644 index 0000000000..f181843bf6 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL3", + "name": "EverGrandeCity_Hall3", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc deleted file mode 100644 index 3f40698962..0000000000 --- a/data/maps/EverGrandeCity_Hall4/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -EverGrandeCity_Hall4_MapWarps: - warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM - -EverGrandeCity_Hall4_MapEvents:: - map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc deleted file mode 100644 index b2a199823c..0000000000 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall4: - .4byte EverGrandeCity_Hall4_Layout - .4byte EverGrandeCity_Hall4_MapEvents - .4byte EverGrandeCity_Hall4_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_HALL4 - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json new file mode 100644 index 0000000000..b2c095e77f --- /dev/null +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL4", + "name": "EverGrandeCity_Hall4", + "layout": "LAYOUT_EVER_GRANDE_CITY_HALL4", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 33, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc deleted file mode 100644 index 655f4645e5..0000000000 --- a/data/maps/EverGrandeCity_Hall5/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall5_MapWarps: - warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - -EverGrandeCity_Hall5_MapEvents:: - map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc deleted file mode 100644 index f15639e5bf..0000000000 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall5: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall5_MapEvents - .4byte EverGrandeCity_Hall5_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json new file mode 100644 index 0000000000..04597cf656 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL5", + "name": "EverGrandeCity_Hall5", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc deleted file mode 100644 index 7d91984377..0000000000 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_HallOfFame_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -EverGrandeCity_HallOfFame_MapWarps: - warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM - -EverGrandeCity_HallOfFame_MapEvents:: - map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc deleted file mode 100644 index 7879c19bf6..0000000000 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_HallOfFame: - .4byte EverGrandeCity_HallOfFame_Layout - .4byte EverGrandeCity_HallOfFame_MapEvents - .4byte EverGrandeCity_HallOfFame_MapScripts - .4byte 0x0 - .2byte MUS_EIKOU_R - .2byte LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json new file mode 100644 index 0000000000..c7440cf989 --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", + "name": "EverGrandeCity_HallOfFame", + "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", + "music": "MUS_EIKOU_R", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc deleted file mode 100644 index d6ad89bea4..0000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_PhoebesRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 - -EverGrandeCity_PhoebesRoom_MapWarps: - 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:: - map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc deleted file mode 100644 index 7869d60071..0000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PhoebesRoom: - .4byte EverGrandeCity_PhoebesRoom_Layout - .4byte EverGrandeCity_PhoebesRoom_MapEvents - .4byte EverGrandeCity_PhoebesRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_PHOEBE - diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json new file mode 100644 index 0000000000..36bf11a134 --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "name": "EverGrandeCity_PhoebesRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_PHOEBE", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL1", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc deleted file mode 100644 index a879c3bf6c..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT - -EverGrandeCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY - warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY - warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F - -EverGrandeCity_PokemonCenter_1F_MapEvents:: - map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 060c11d0b9..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte EverGrandeCity_PokemonCenter_1F_MapEvents - .4byte EverGrandeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..7263f67cb2 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "name": "EverGrandeCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79", + "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 5507659225..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -EverGrandeCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -EverGrandeCity_PokemonCenter_2F_MapEvents:: - map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc deleted file mode 100644 index ae70ad359d..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte EverGrandeCity_PokemonCenter_2F_MapEvents - .4byte EverGrandeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..195197b562 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", + "name": "EverGrandeCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc deleted file mode 100644 index 524540d9d9..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -EverGrandeCity_PokemonLeague_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - -EverGrandeCity_PokemonLeague_1F_MapWarps: - 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_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:: - map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc deleted file mode 100644 index 497d81582c..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_1F: - .4byte EverGrandeCity_PokemonLeague_1F_Layout - .4byte EverGrandeCity_PokemonLeague_1F_MapEvents - .4byte EverGrandeCity_PokemonLeague_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json new file mode 100644 index 0000000000..5fe580001b --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "name": "EverGrandeCity_PokemonLeague_1F", + "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 7, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc deleted file mode 100644 index 2f26346c81..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonLeague_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -EverGrandeCity_PokemonLeague_2F_MapWarps: - warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -EverGrandeCity_PokemonLeague_2F_MapEvents:: - map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc deleted file mode 100644 index c03c85120f..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_2F: - .4byte PokemonCenter_2F_Layout - .4byte EverGrandeCity_PokemonLeague_2F_MapEvents - .4byte EverGrandeCity_PokemonLeague_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json new file mode 100644 index 0000000000..43d777f358 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", + "name": "EverGrandeCity_PokemonLeague_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc deleted file mode 100644 index ca7f7278dd..0000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_SidneysRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 - -EverGrandeCity_SidneysRoom_MapWarps: - 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:: - map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc deleted file mode 100644 index e7d7f08129..0000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_SidneysRoom: - .4byte EverGrandeCity_SidneysRoom_Layout - .4byte EverGrandeCity_SidneysRoom_MapEvents - .4byte EverGrandeCity_SidneysRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_SIDNEY - diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json new file mode 100644 index 0000000000..2eceb30aea --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "name": "EverGrandeCity_SidneysRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_SIDNEY", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_SidneysRoom_EventScript_227F64", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc deleted file mode 100644 index d5955c9e6a..0000000000 --- a/data/maps/FallarborTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FallarborTown_MapConnectionsList: - connection left, 0, MAP_ROUTE114 - connection right, 0, MAP_ROUTE113 - -FallarborTown_MapConnections: - .4byte 2 - .4byte FallarborTown_MapConnectionsList - diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc deleted file mode 100644 index b3c451595f..0000000000 --- a/data/maps/FallarborTown/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -FallarborTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL - -FallarborTown_MapWarps: - warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART - warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY - warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 - warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 - -FallarborTown_MapBGEvents: - bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A - bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 - bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 - bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 - bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 - bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 - bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET - -FallarborTown_MapEvents:: - map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents - diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc deleted file mode 100644 index 2e74cee388..0000000000 --- a/data/maps/FallarborTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown: - .4byte FallarborTown_Layout - .4byte FallarborTown_MapEvents - .4byte FallarborTown_MapScripts - .4byte FallarborTown_MapConnections - .2byte MUS_TONEKUSA - .2byte LAYOUT_FALLARBOR_TOWN - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json new file mode 100644 index 0000000000..e2519f8804 --- /dev/null +++ b/data/maps/FallarborTown/map.json @@ -0,0 +1,185 @@ +{ + "id": "MAP_FALLARBOR_TOWN", + "name": "FallarborTown", + "layout": "LAYOUT_FALLARBOR_TOWN", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE114" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE113" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB22B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB20C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB234", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB23D", + "flag": "FLAG_HIDE_FALLARBOR_AZURILL" + } + ], + "warp_events": [ + { + "x": 15, + "y": 15, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 17, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 15, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB250" + }, + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 10, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB259" + }, + { + "type": "sign", + "x": 17, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB262" + }, + { + "type": "hidden_item", + "x": 2, + "y": 15, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc deleted file mode 100644 index d452752d7e..0000000000 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FallarborTown_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -FallarborTown_BattleTentBattleRoom_MapEvents:: - map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc deleted file mode 100644 index 615c0ed266..0000000000 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentBattleRoom: - .4byte BattleTentBattleRoom_Layout - .4byte FallarborTown_BattleTentBattleRoom_MapEvents - .4byte FallarborTown_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json new file mode 100644 index 0000000000..53a2801962 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "FallarborTown_BattleTentBattleRoom", + "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc deleted file mode 100644 index 18c0dfb397..0000000000 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -FallarborTown_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -FallarborTown_BattleTentCorridor_MapEvents:: - map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc deleted file mode 100644 index fd64a32662..0000000000 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte FallarborTown_BattleTentCorridor_MapEvents - .4byte FallarborTown_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json new file mode 100644 index 0000000000..51d69dc932 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR", + "name": "FallarborTown_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc deleted file mode 100644 index 2a9b758ca8..0000000000 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FallarborTown_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - -FallarborTown_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN - warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN - -FallarborTown_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F - -FallarborTown_BattleTentLobby_MapEvents:: - map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents - diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc deleted file mode 100644 index 4bdba3d514..0000000000 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte FallarborTown_BattleTentLobby_MapEvents - .4byte FallarborTown_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json new file mode 100644 index 0000000000..5c36cf3d93 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", + "name": "FallarborTown_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200001", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_20020D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200216", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_20021F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200228", + "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_BattleTentLobby_EventScript_20024F" + } + ] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc deleted file mode 100644 index 9db77af03f..0000000000 --- a/data/maps/FallarborTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FallarborTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 - -FallarborTown_House1_MapWarps: - warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN - warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN - -FallarborTown_House1_MapEvents:: - map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc deleted file mode 100644 index a17a5e0aba..0000000000 --- a/data/maps/FallarborTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_House1: - .4byte House1_Layout - .4byte FallarborTown_House1_MapEvents - .4byte FallarborTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json new file mode 100644 index 0000000000..fb66ad1de5 --- /dev/null +++ b/data/maps/FallarborTown_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FALLARBOR_TOWN_HOUSE1", + "name": "FallarborTown_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House1_EventScript_200F13", + "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House1_EventScript_200FBC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc deleted file mode 100644 index 117322b020..0000000000 --- a/data/maps/FallarborTown_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FallarborTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 - -FallarborTown_House2_MapWarps: - warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN - -FallarborTown_House2_MapEvents:: - map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc deleted file mode 100644 index bdbf10fed6..0000000000 --- a/data/maps/FallarborTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_House2: - .4byte House2_Layout - .4byte FallarborTown_House2_MapEvents - .4byte FallarborTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json new file mode 100644 index 0000000000..2b5ea52147 --- /dev/null +++ b/data/maps/FallarborTown_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_FALLARBOR_TOWN_HOUSE2", + "name": "FallarborTown_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House2_EventScript_201383", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc deleted file mode 100644 index b4870cf571..0000000000 --- a/data/maps/FallarborTown_Mart/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 - -FallarborTown_Mart_MapWarps: - warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN - -FallarborTown_Mart_MapEvents:: - map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc deleted file mode 100644 index be4e4ae9ed..0000000000 --- a/data/maps/FallarborTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_Mart: - .4byte Mart_Layout - .4byte FallarborTown_Mart_MapEvents - .4byte FallarborTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json new file mode 100644 index 0000000000..9416efe011 --- /dev/null +++ b/data/maps/FallarborTown_Mart/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_FALLARBOR_TOWN_MART", + "name": "FallarborTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFD06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_2C80B6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc deleted file mode 100644 index f091ffce1e..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE - -FallarborTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F - -FallarborTown_PokemonCenter_1F_MapEvents:: - map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc deleted file mode 100644 index a03b385b51..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte FallarborTown_PokemonCenter_1F_MapEvents - .4byte FallarborTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..a432b8a1ab --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "name": "FallarborTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", + "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc deleted file mode 100644 index bc3c01dd8e..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -FallarborTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -FallarborTown_PokemonCenter_2F_MapEvents:: - map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc deleted file mode 100644 index f3a761312a..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte FallarborTown_PokemonCenter_2F_MapEvents - .4byte FallarborTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..be694d2572 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", + "name": "FallarborTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc deleted file mode 100644 index 0ae752f936..0000000000 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -FarawayIsland_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - -FarawayIsland_Entrance_MapWarps: - warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR - warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR - -FarawayIsland_Entrance_MapCoordEvents: - coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D - coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - -FarawayIsland_Entrance_MapBGEvents: - bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 - -FarawayIsland_Entrance_MapEvents:: - map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents - diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc deleted file mode 100644 index b76f97aef6..0000000000 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Entrance: - .4byte FarawayIsland_Entrance_Layout - .4byte FarawayIsland_Entrance_MapEvents - .4byte FarawayIsland_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_FARAWAY_ISLAND_ENTRANCE - .byte MAPSEC_FARAWAY_ISLAND - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json new file mode 100644 index 0000000000..683010e127 --- /dev/null +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_FARAWAY_ISLAND_ENTRANCE", + "name": "FarawayIsland_Entrance", + "layout": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_FARAWAY_ISLAND", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FarawayIsland_Entrance_EventScript_267CA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 13, + "y": 41, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 22, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 18, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C98" + }, + { + "type": "trigger", + "x": 10, + "y": 20, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C9D" + }, + { + "type": "trigger", + "x": 22, + "y": 9, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C98" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 32, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FarawayIsland_Entrance_EventScript_267CF1" + } + ] +} \ No newline at end of file diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc deleted file mode 100644 index a8611c0386..0000000000 --- a/data/maps/FarawayIsland_Interior/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FarawayIsland_Interior_EventObjects: - object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW - -FarawayIsland_Interior_MapWarps: - warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE - warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE - -FarawayIsland_Interior_MapEvents:: - map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc deleted file mode 100644 index 828202471d..0000000000 --- a/data/maps/FarawayIsland_Interior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Interior: - .4byte FarawayIsland_Interior_Layout - .4byte FarawayIsland_Interior_MapEvents - .4byte FarawayIsland_Interior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_FARAWAY_ISLAND_INTERIOR - .byte MAPSEC_FARAWAY_ISLAND - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json new file mode 100644 index 0000000000..d6531d043a --- /dev/null +++ b/data/maps/FarawayIsland_Interior/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_FARAWAY_ISLAND_INTERIOR", + "name": "FarawayIsland_Interior", + "layout": "LAYOUT_FARAWAY_ISLAND_INTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_FARAWAY_ISLAND", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MEW", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 15, + "movement_range_y": 15, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "FarawayIsland_Interior_EventScript_267DF2", + "flag": "FLAG_HIDE_MEW" + } + ], + "warp_events": [ + { + "x": 12, + "y": 19, + "elevation": 0, + "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 19, + "elevation": 0, + "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc deleted file mode 100644 index 7fd7e44adb..0000000000 --- a/data/maps/FieryPath/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FieryPath_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE - -FieryPath_MapWarps: - warp_def 26, 36, 3, 4, MAP_ROUTE112 - warp_def 26, 4, 3, 5, MAP_ROUTE112 - -FieryPath_MapEvents:: - map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc deleted file mode 100644 index 83e339adbd..0000000000 --- a/data/maps/FieryPath/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FieryPath: - .4byte FieryPath_Layout - .4byte FieryPath_MapEvents - .4byte FieryPath_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_FIERY_PATH - .byte MAPSEC_FIERY_PATH - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json new file mode 100644 index 0000000000..26c609e05d --- /dev/null +++ b/data/maps/FieryPath/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_FIERY_PATH", + "name": "FieryPath", + "layout": "LAYOUT_FIERY_PATH", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_FIERY_PATH", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_29119E", + "flag": "FLAG_ITEM_FIERY_PATH_TM06" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 17, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_291191", + "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE" + } + ], + "warp_events": [ + { + "x": 26, + "y": 36, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc deleted file mode 100644 index 5e48951c29..0000000000 --- a/data/maps/FortreeCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FortreeCity_MapConnectionsList: - connection left, 0, MAP_ROUTE119 - connection right, 0, MAP_ROUTE120 - -FortreeCity_MapConnections: - .4byte 2 - .4byte FortreeCity_MapConnectionsList - diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc deleted file mode 100644 index 8653934040..0000000000 --- a/data/maps/FortreeCity/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -FortreeCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 - object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON - -FortreeCity_MapWarps: - warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F - warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 - warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM - warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART - warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2 - warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3 - warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4 - warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 - warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP - -FortreeCity_MapBGEvents: - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602 - bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 - bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A - bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E260B - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 - bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A - -FortreeCity_MapEvents:: - map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents - diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc deleted file mode 100644 index 9d7cd5aaea..0000000000 --- a/data/maps/FortreeCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity: - .4byte FortreeCity_Layout - .4byte FortreeCity_MapEvents - .4byte FortreeCity_MapScripts - .4byte FortreeCity_MapConnections - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json new file mode 100644 index 0000000000..0aec65572d --- /dev/null +++ b/data/maps/FortreeCity/map.json @@ -0,0 +1,236 @@ +{ + "id": "MAP_FORTREE_CITY", + "name": "FortreeCity", + "layout": "LAYOUT_FORTREE_CITY", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE119" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE120" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 31, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 32, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25DE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 32, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 11, + "y": 14, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 25, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E2614", + "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" + } + ], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 11, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 14, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 2, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE5", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_DECORATION_SHOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FortreeCity_EventScript_1E2602" + }, + { + "type": "sign", + "x": 7, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 5, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 26, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FortreeCity_EventScript_1E260B" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc deleted file mode 100644 index 604e3fda1a..0000000000 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FortreeCity_DecorationShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 - -FortreeCity_DecorationShop_MapWarps: - warp_def 3, 5, 0, 8, MAP_FORTREE_CITY - warp_def 4, 5, 0, 8, MAP_FORTREE_CITY - -FortreeCity_DecorationShop_MapEvents:: - map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc deleted file mode 100644 index b4e0c92051..0000000000 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_DecorationShop: - .4byte FortreeCity_DecorationShop_Layout - .4byte FortreeCity_DecorationShop_MapEvents - .4byte FortreeCity_DecorationShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_DECORATION_SHOP - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json new file mode 100644 index 0000000000..6a8d9fdabd --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_FORTREE_CITY_DECORATION_SHOP", + "name": "FortreeCity_DecorationShop", + "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_21800E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_218017", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_218020", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_21804C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc deleted file mode 100644 index e71b6ea4ec..0000000000 --- a/data/maps/FortreeCity_Gym/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -FortreeCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 - object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 - -FortreeCity_Gym_MapWarps: - warp_def 15, 24, 0, 2, MAP_FORTREE_CITY - warp_def 16, 24, 0, 2, MAP_FORTREE_CITY - -FortreeCity_Gym_MapBGEvents: - bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751 - bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761 - -FortreeCity_Gym_MapEvents:: - map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents - diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc deleted file mode 100644 index 2bde54ddd5..0000000000 --- a/data/maps/FortreeCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Gym: - .4byte FortreeCity_Gym_Layout - .4byte FortreeCity_Gym_MapEvents - .4byte FortreeCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_FORTREE_CITY_GYM - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json new file mode 100644 index 0000000000..ad6b7c6b91 --- /dev/null +++ b/data/maps/FortreeCity_Gym/map.json @@ -0,0 +1,157 @@ +{ + "id": "MAP_FORTREE_CITY_GYM", + "name": "FortreeCity_Gym", + "layout": "LAYOUT_FORTREE_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WINONA", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Gym_EventScript_2165C8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FortreeCity_Gym_EventScript_2166A8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FortreeCity_Gym_EventScript_2166D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 5, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FortreeCity_Gym_EventScript_2166ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FortreeCity_Gym_EventScript_2166BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 15, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Gym_EventScript_216732", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FortreeCity_Gym_EventScript_216704", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FortreeCity_Gym_EventScript_21671B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 2 + }, + { + "x": 16, + "y": 24, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_Gym_EventScript_216751" + }, + { + "type": "sign", + "x": 17, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_Gym_EventScript_216761" + } + ] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc deleted file mode 100644 index 5cf082d413..0000000000 --- a/data/maps/FortreeCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 - -FortreeCity_House1_MapWarps: - warp_def 3, 5, 0, 1, MAP_FORTREE_CITY - warp_def 4, 5, 0, 1, MAP_FORTREE_CITY - -FortreeCity_House1_MapEvents:: - map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc deleted file mode 100644 index 636a147f44..0000000000 --- a/data/maps/FortreeCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House1: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House1_MapEvents - .4byte FortreeCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json new file mode 100644 index 0000000000..8f349e6403 --- /dev/null +++ b/data/maps/FortreeCity_House1/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE1", + "name": "FortreeCity_House1", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_2162BB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_216368", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_21635F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc deleted file mode 100644 index ca183c0055..0000000000 --- a/data/maps/FortreeCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 - -FortreeCity_House2_MapWarps: - warp_def 3, 5, 0, 4, MAP_FORTREE_CITY - warp_def 4, 5, 0, 4, MAP_FORTREE_CITY - -FortreeCity_House2_MapEvents:: - map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc deleted file mode 100644 index e61c000f61..0000000000 --- a/data/maps/FortreeCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House2: - .4byte FortreeCity_House2_Layout - .4byte FortreeCity_House2_MapEvents - .4byte FortreeCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE2 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json new file mode 100644 index 0000000000..7b9a67ab6b --- /dev/null +++ b/data/maps/FortreeCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE2", + "name": "FortreeCity_House2", + "layout": "LAYOUT_FORTREE_CITY_HOUSE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House2_EventScript_2177CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House2_EventScript_2C811E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc deleted file mode 100644 index 8a158f8ff3..0000000000 --- a/data/maps/FortreeCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 - -FortreeCity_House3_MapWarps: - warp_def 3, 5, 0, 5, MAP_FORTREE_CITY - warp_def 4, 5, 0, 5, MAP_FORTREE_CITY - -FortreeCity_House3_MapEvents:: - map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc deleted file mode 100644 index db66e65d8a..0000000000 --- a/data/maps/FortreeCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House3: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House3_MapEvents - .4byte FortreeCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json new file mode 100644 index 0000000000..d886e0cdb0 --- /dev/null +++ b/data/maps/FortreeCity_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE3", + "name": "FortreeCity_House3", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House3_EventScript_217AE8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House3_EventScript_217AF1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc deleted file mode 100644 index bc6a4a39c9..0000000000 --- a/data/maps/FortreeCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL - -FortreeCity_House4_MapWarps: - warp_def 3, 5, 0, 6, MAP_FORTREE_CITY - warp_def 4, 5, 0, 6, MAP_FORTREE_CITY - -FortreeCity_House4_MapEvents:: - map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc deleted file mode 100644 index cd340c2940..0000000000 --- a/data/maps/FortreeCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House4: - .4byte FortreeCity_House2_Layout - .4byte FortreeCity_House4_MapEvents - .4byte FortreeCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE2 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json new file mode 100644 index 0000000000..11fd05bf5e --- /dev/null +++ b/data/maps/FortreeCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE4", + "name": "FortreeCity_House4", + "layout": "LAYOUT_FORTREE_CITY_HOUSE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217C81", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217C8A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217D20", + "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc deleted file mode 100644 index bc090cb809..0000000000 --- a/data/maps/FortreeCity_House5/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 - -FortreeCity_House5_MapWarps: - warp_def 3, 5, 0, 7, MAP_FORTREE_CITY - warp_def 4, 5, 0, 7, MAP_FORTREE_CITY - -FortreeCity_House5_MapEvents:: - map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc deleted file mode 100644 index a04e91eb31..0000000000 --- a/data/maps/FortreeCity_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House5: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House5_MapEvents - .4byte FortreeCity_House5_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json new file mode 100644 index 0000000000..37e23502b6 --- /dev/null +++ b/data/maps/FortreeCity_House5/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE5", + "name": "FortreeCity_House5", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217EF2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217F04", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217EFB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc deleted file mode 100644 index ceb68f7ea1..0000000000 --- a/data/maps/FortreeCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FortreeCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 - -FortreeCity_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_FORTREE_CITY - warp_def 4, 7, 0, 3, MAP_FORTREE_CITY - -FortreeCity_Mart_MapEvents:: - map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc deleted file mode 100644 index f4aaf9ce17..0000000000 --- a/data/maps/FortreeCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Mart: - .4byte Mart_Layout - .4byte FortreeCity_Mart_MapEvents - .4byte FortreeCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json new file mode 100644 index 0000000000..3b7e0723b4 --- /dev/null +++ b/data/maps/FortreeCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_FORTREE_CITY_MART", + "name": "FortreeCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_217666", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_217698", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_2176A1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_2176AA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc deleted file mode 100644 index af7b5f72ef..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 - -FortreeCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_FORTREE_CITY - warp_def 6, 8, 3, 0, MAP_FORTREE_CITY - warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F - -FortreeCity_PokemonCenter_1F_MapEvents:: - map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 543e672a2c..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte FortreeCity_PokemonCenter_1F_MapEvents - .4byte FortreeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..f51926d3be --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "name": "FortreeCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_217407", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 7cdbc4a82e..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -FortreeCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -FortreeCity_PokemonCenter_2F_MapEvents:: - map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 8dbfeed079..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte FortreeCity_PokemonCenter_2F_MapEvents - .4byte FortreeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..4984b76926 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", + "name": "FortreeCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc deleted file mode 100644 index 1885f3cf5d..0000000000 --- a/data/maps/GraniteCave_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -GraniteCave_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE - -GraniteCave_1F_MapWarps: - warp_def 37, 12, 3, 0, MAP_ROUTE106 - warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F - warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F - warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM - -GraniteCave_1F_MapEvents:: - map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc deleted file mode 100644 index 2f834c7eb9..0000000000 --- a/data/maps/GraniteCave_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_1F: - .4byte GraniteCave_1F_Layout - .4byte GraniteCave_1F_MapEvents - .4byte GraniteCave_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_1F - .byte MAPSEC_GRANITE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json new file mode 100644 index 0000000000..3f720a5692 --- /dev/null +++ b/data/maps/GraniteCave_1F/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_GRANITE_CAVE_1F", + "name": "GraniteCave_1F", + "layout": "LAYOUT_GRANITE_CAVE_1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 36, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_1F_EventScript_22DA5E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_1F_EventScript_291150", + "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 37, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE106", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 11, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_STEVENS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc deleted file mode 100644 index f3dcbcbafb..0000000000 --- a/data/maps/GraniteCave_B1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL - -GraniteCave_B1F_MapWarps: - warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F - warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F - warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F - warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F - warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F - warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F - warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F - -GraniteCave_B1F_MapEvents:: - map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc deleted file mode 100644 index 546c246580..0000000000 --- a/data/maps/GraniteCave_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F: - .4byte GraniteCave_B1F_Layout - .4byte GraniteCave_B1F_MapEvents - .4byte GraniteCave_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_B1F - .byte MAPSEC_GRANITE_CAVE - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json new file mode 100644 index 0000000000..6e3a144036 --- /dev/null +++ b/data/maps/GraniteCave_B1F/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_GRANITE_CAVE_B1F", + "name": "GraniteCave_B1F", + "layout": "LAYOUT_GRANITE_CAVE_B1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B1F_EventScript_29115D", + "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL" + } + ], + "warp_events": [ + { + "x": 25, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 2 + }, + { + "x": 29, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 3 + }, + { + "x": 29, + "y": 2, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc deleted file mode 100644 index fc321dfb0b..0000000000 --- a/data/maps/GraniteCave_B2F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -GraniteCave_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17 - -GraniteCave_B2F_MapWarps: - warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F - warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F - warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F - warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F - warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F - -GraniteCave_B2F_MapBGEvents: - bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 - bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 - -GraniteCave_B2F_MapEvents:: - map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents - diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc deleted file mode 100644 index ce63017bef..0000000000 --- a/data/maps/GraniteCave_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B2F: - .4byte GraniteCave_B2F_Layout - .4byte GraniteCave_B2F_MapEvents - .4byte GraniteCave_B2F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_B2F - .byte MAPSEC_GRANITE_CAVE - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json new file mode 100644 index 0000000000..18b5ca9d42 --- /dev/null +++ b/data/maps/GraniteCave_B2F/map.json @@ -0,0 +1,191 @@ +{ + "id": "MAP_GRANITE_CAVE_B2F", + "name": "GraniteCave_B2F", + "layout": "LAYOUT_GRANITE_CAVE_B2F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_29116A", + "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_291177", + "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 2, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 4, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 6, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_17" + } + ], + "warp_events": [ + { + "x": 29, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 2 + }, + { + "x": 28, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 4 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 5 + }, + { + "x": 29, + "y": 2, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 28, + "y": 6, + "elevation": 3, + "item": "ITEM_EVERSTONE", + "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1" + }, + { + "type": "hidden_item", + "x": 15, + "y": 11, + "elevation": 3, + "item": "ITEM_EVERSTONE", + "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc deleted file mode 100644 index 747fe2cc3a..0000000000 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -GraniteCave_StevensRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN - -GraniteCave_StevensRoom_MapWarps: - warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F - -GraniteCave_StevensRoom_MapEvents:: - map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc deleted file mode 100644 index 6d90fc6c8e..0000000000 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_StevensRoom: - .4byte GraniteCave_StevensRoom_Layout - .4byte GraniteCave_StevensRoom_MapEvents - .4byte GraniteCave_StevensRoom_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_STEVENS_ROOM - .byte MAPSEC_GRANITE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json new file mode 100644 index 0000000000..22a6207c27 --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", + "name": "GraniteCave_StevensRoom", + "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_StevensRoom_EventScript_22DC7B", + "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc deleted file mode 100644 index c7888165fd..0000000000 --- a/data/maps/InsideOfTruck/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -InsideOfTruck_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - -InsideOfTruck_MapWarps: - warp_def 4, 1, 0, 127, MAP_NONE - warp_def 4, 2, 0, 127, MAP_NONE - warp_def 4, 3, 0, 127, MAP_NONE - -InsideOfTruck_MapCoordEvents: - coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - -InsideOfTruck_MapBGEvents: - bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - -InsideOfTruck_MapEvents:: - map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents - diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc deleted file mode 100644 index 7b1889e250..0000000000 --- a/data/maps/InsideOfTruck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -InsideOfTruck: - .4byte InsideOfTruck_Layout - .4byte InsideOfTruck_MapEvents - .4byte InsideOfTruck_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_INSIDE_OF_TRUCK - .byte MAPSEC_INSIDE_OF_TRUCK - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json new file mode 100644 index 0000000000..4978d841ca --- /dev/null +++ b/data/maps/InsideOfTruck/map.json @@ -0,0 +1,151 @@ +{ + "id": "MAP_INSIDE_OF_TRUCK", + "name": "InsideOfTruck", + "layout": "LAYOUT_INSIDE_OF_TRUCK", + "music": "65535", + "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 0, + "y": 0, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 0, + "y": 3, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 2, + "y": 3, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 4, + "y": 2, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 4, + "y": 3, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 1, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + }, + { + "type": "trigger", + "x": 3, + "y": 2, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 0, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 2, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 0, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + } + ] +} \ No newline at end of file diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc deleted file mode 100644 index fa9c3deba3..0000000000 --- a/data/maps/IslandCave/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -IslandCave_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE - -IslandCave_MapWarps: - warp_def 8, 29, 3, 0, MAP_ROUTE105 - warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE - warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE - -IslandCave_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D - -IslandCave_MapEvents:: - map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents - diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc deleted file mode 100644 index 15eb2b3603..0000000000 --- a/data/maps/IslandCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandCave: - .4byte IslandCave_Layout - .4byte IslandCave_MapEvents - .4byte IslandCave_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_ISLAND_CAVE - .byte MAPSEC_ISLAND_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json new file mode 100644 index 0000000000..c6365025b2 --- /dev/null +++ b/data/maps/IslandCave/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_ISLAND_CAVE", + "name": "IslandCave", + "layout": "LAYOUT_ISLAND_CAVE", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_ISLAND_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGICE", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IslandCave_EventScript_238F58", + "flag": "FLAG_HIDE_REGICE" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE105", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238EEF" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238F1D" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238F1D" + } + ] +} \ No newline at end of file diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc deleted file mode 100644 index 5d33af93e7..0000000000 --- a/data/maps/JaggedPass/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -JaggedPass_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 - object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 - -JaggedPass_MapWarps: - warp_def 14, 40, 3, 2, MAP_ROUTE112 - warp_def 15, 40, 3, 3, MAP_ROUTE112 - warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY - warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY - warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F - -JaggedPass_MapCoordEvents: - coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY - coord_event 21, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 22, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 21, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - -JaggedPass_MapBGEvents: - bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL - bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL - -JaggedPass_MapEvents:: - map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents - diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc deleted file mode 100644 index 870b817ec2..0000000000 --- a/data/maps/JaggedPass/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -JaggedPass: - .4byte JaggedPass_Layout - .4byte JaggedPass_MapEvents - .4byte JaggedPass_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_JAGGED_PASS - .byte MAPSEC_JAGGED_PASS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json new file mode 100644 index 0000000000..748fc99149 --- /dev/null +++ b/data/maps/JaggedPass/map.json @@ -0,0 +1,246 @@ +{ + "id": "MAP_JAGGED_PASS", + "name": "JaggedPass", + "layout": "LAYOUT_JAGGED_PASS", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_JAGGED_PASS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_230785", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 16, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "JaggedPass_EventScript_2307FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "JaggedPass_EventScript_291184", + "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 9, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_23079C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 16, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "JaggedPass_EventScript_230718", + "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 14, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_230871", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 18, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_23085A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 40, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 2 + }, + { + "x": 15, + "y": 40, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 13, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 21, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 14, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 18, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 22, + "y": 19, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "trigger", + "x": 21, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 22, + "y": 20, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 21, + "y": 20, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 14, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 13, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 8, + "y": 10, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 7, + "y": 29, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc deleted file mode 100644 index e3d4e1fb1d..0000000000 --- a/data/maps/LavaridgeTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -LavaridgeTown_MapConnectionsList: - connection right, -40, MAP_ROUTE112 - -LavaridgeTown_MapConnections: - .4byte 1 - .4byte LavaridgeTown_MapConnectionsList - diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc deleted file mode 100644 index aeb55249e8..0000000000 --- a/data/maps/LavaridgeTown/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LavaridgeTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 - object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 - object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 - -LavaridgeTown_MapWarps: - warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP - warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART - warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE - warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - -LavaridgeTown_MapCoordEvents: - coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA - -LavaridgeTown_MapBGEvents: - bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7 - bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE - bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A - bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7A5 - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL - -LavaridgeTown_MapEvents:: - map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents - diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc deleted file mode 100644 index 5365e1a005..0000000000 --- a/data/maps/LavaridgeTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown: - .4byte LavaridgeTown_Layout - .4byte LavaridgeTown_MapEvents - .4byte LavaridgeTown_MapScripts - .4byte LavaridgeTown_MapConnections - .2byte MUS_MACHI_S4 - .2byte LAYOUT_LAVARIDGE_TOWN - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json new file mode 100644 index 0000000000..6bf3162c8e --- /dev/null +++ b/data/maps/LavaridgeTown/map.json @@ -0,0 +1,262 @@ +{ + "id": "MAP_LAVARIDGE_TOWN", + "name": "LavaridgeTown", + "layout": "LAYOUT_LAVARIDGE_TOWN", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE112" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA73B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA70E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA717", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 10, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA720", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA729", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA732", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 12, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA744", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_HERB_SHOP", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 3, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "LavaridgeTown_EventScript_1EA6FA" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7B7" + }, + { + "type": "sign", + "x": 7, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7AE" + }, + { + "type": "sign", + "x": 17, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 13, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7A5" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 16, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E73" + }, + { + "type": "hidden_item", + "x": 4, + "y": 5, + "elevation": 3, + "item": "ITEM_ICE_HEAL", + "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc deleted file mode 100644 index 08d22737c1..0000000000 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -LavaridgeTown_Gym_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 - -LavaridgeTown_Gym_1F_MapWarps: - warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 9, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 17, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 9, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 15, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 14, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 1, 14, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 10, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 10, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 6, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 6, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 3, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 2, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 7, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 6, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 16, 0, 20, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 3, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 14, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F - -LavaridgeTown_Gym_1F_MapBGEvents: - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B - bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B - -LavaridgeTown_Gym_1F_MapEvents:: - map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents - diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc deleted file mode 100644 index f71786ce0a..0000000000 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_1F: - .4byte LavaridgeTown_Gym_1F_Layout - .4byte LavaridgeTown_Gym_1F_MapEvents - .4byte LavaridgeTown_Gym_1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_LAVARIDGE_TOWN_GYM_1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json new file mode 100644 index 0000000000..dac9467f06 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -0,0 +1,299 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_GYM_1F", + "name": "LavaridgeTown_Gym_1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "x": 13, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE900", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 3 + }, + { + "x": 0, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 15, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 6 + }, + { + "x": 3, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 7 + }, + { + "x": 1, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 8 + }, + { + "x": 0, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 9 + }, + { + "x": 3, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 10 + }, + { + "x": 0, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 11 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 12 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 13 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 14 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 15 + }, + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 16 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 17 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 18 + }, + { + "x": 4, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 20 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 19 + }, + { + "x": 14, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 21 + }, + { + "x": 13, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 22 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 23 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_Gym_1F_EventScript_1FE98B" + }, + { + "type": "sign", + "x": 16, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_Gym_1F_EventScript_1FE99B" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc deleted file mode 100644 index 64512a994a..0000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LavaridgeTown_Gym_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 - -LavaridgeTown_Gym_B1F_MapWarps: - warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 14, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 9, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 2, 15, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 14, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 1, 14, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 10, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 10, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 6, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 2, 3, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 2, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 7, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 8, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 10, 6, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 12, 3, 3, 22, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 16, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 14, 6, 3, 23, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F - -LavaridgeTown_Gym_B1F_MapEvents:: - map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc deleted file mode 100644 index fc1d6308aa..0000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_B1F: - .4byte LavaridgeTown_Gym_B1F_Layout - .4byte LavaridgeTown_Gym_B1F_MapEvents - .4byte LavaridgeTown_Gym_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_LAVARIDGE_TOWN_GYM_B1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json new file mode 100644 index 0000000000..c81e42dc23 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -0,0 +1,242 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "name": "LavaridgeTown_Gym_B1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 13, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 2 + }, + { + "x": 0, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 15, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 8 + }, + { + "x": 3, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 10 + }, + { + "x": 0, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 11 + }, + { + "x": 3, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 12 + }, + { + "x": 0, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 13 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 14 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 15 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 16 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 17 + }, + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 18 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 19 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 20 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 22 + }, + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 21 + }, + { + "x": 14, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 23 + }, + { + "x": 13, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 24 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 25 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc deleted file mode 100644 index 3cce9612fc..0000000000 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_HerbShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 - -LavaridgeTown_HerbShop_MapWarps: - warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN - -LavaridgeTown_HerbShop_MapEvents:: - map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc deleted file mode 100644 index 68fe70df70..0000000000 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_HerbShop: - .4byte LavaridgeTown_HerbShop_Layout - .4byte LavaridgeTown_HerbShop_MapEvents - .4byte LavaridgeTown_HerbShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_LAVARIDGE_TOWN_HERB_SHOP - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json new file mode 100644 index 0000000000..c8091527c5 --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", + "name": "LavaridgeTown_HerbShop", + "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE505", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc deleted file mode 100644 index 77af1e7461..0000000000 --- a/data/maps/LavaridgeTown_House/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 - -LavaridgeTown_House_MapWarps: - warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN - -LavaridgeTown_House_MapEvents:: - map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc deleted file mode 100644 index 0815c6fb42..0000000000 --- a/data/maps/LavaridgeTown_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_House: - .4byte House3_Layout - .4byte LavaridgeTown_House_MapEvents - .4byte LavaridgeTown_House_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json new file mode 100644 index 0000000000..5465c81f84 --- /dev/null +++ b/data/maps/LavaridgeTown_House/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_HOUSE", + "name": "LavaridgeTown_House", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_1FF912", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_1FF91B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_2C804E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc deleted file mode 100644 index 24923dc512..0000000000 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 - -LavaridgeTown_Mart_MapWarps: - warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN - -LavaridgeTown_Mart_MapEvents:: - map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc deleted file mode 100644 index 9c96370f98..0000000000 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Mart: - .4byte Mart_Layout - .4byte LavaridgeTown_Mart_MapEvents - .4byte LavaridgeTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json new file mode 100644 index 0000000000..1208d3e536 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_MART", + "name": "LavaridgeTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FF9CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FF9FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FFA07", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 01974866cb..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 - -LavaridgeTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN - warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN - warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F - warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN - -LavaridgeTown_PokemonCenter_1F_MapEvents:: - map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 4e17b5fd09..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F: - .4byte LavaridgeTown_PokemonCenter_1F_Layout - .4byte LavaridgeTown_PokemonCenter_1F_MapEvents - .4byte LavaridgeTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..18980fb3cb --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "name": "LavaridgeTown_PokemonCenter_1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 4da5d3b1ff..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -LavaridgeTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -LavaridgeTown_PokemonCenter_2F_MapEvents:: - map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 4a7226e29b..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte LavaridgeTown_PokemonCenter_2F_MapEvents - .4byte LavaridgeTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..a8c2ef9a32 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", + "name": "LavaridgeTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc deleted file mode 100644 index 6e0cdff931..0000000000 --- a/data/maps/LilycoveCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -LilycoveCity_MapConnectionsList: - connection left, 10, MAP_ROUTE121 - connection right, -10, MAP_ROUTE124 - -LilycoveCity_MapConnections: - .4byte 2 - .4byte LilycoveCity_MapConnectionsList - diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc deleted file mode 100644 index 71022af32f..0000000000 --- a/data/maps/LilycoveCity/events.inc +++ /dev/null @@ -1,58 +0,0 @@ -LilycoveCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 - object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 - object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 - object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 - object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 - -LilycoveCity_MapWarps: - warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F - warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE - warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1 - warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2 - warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3 - warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4 - warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR - warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - -LilycoveCity_MapBGEvents: - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A - bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 - bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B - bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 - bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2CFF - bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D08 - bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D11 - bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44 - bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62 - bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74 - bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE - bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP - bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL - -LilycoveCity_MapEvents:: - map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents - diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc deleted file mode 100644 index 93120b8969..0000000000 --- a/data/maps/LilycoveCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity: - .4byte LilycoveCity_Layout - .4byte LilycoveCity_MapEvents - .4byte LilycoveCity_MapScripts - .4byte LilycoveCity_MapConnections - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json new file mode 100644 index 0000000000..d10f00260b --- /dev/null +++ b/data/maps/LilycoveCity/map.json @@ -0,0 +1,522 @@ +{ + "id": "MAP_LILYCOVE_CITY", + "name": "LilycoveCity", + "layout": "LAYOUT_LILYCOVE_CITY", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 10, + "map": "MAP_ROUTE121" + }, + { + "direction": "right", + "offset": -10, + "map": "MAP_ROUTE124" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 32, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C53", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 15, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C2B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 28, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C22", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C4A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 16, + "y": 9, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C91", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 35, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C72", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 35, + "y": 37, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C9A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 34, + "y": 37, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CA3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 57, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CAC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 73, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2D7D", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 61, + "y": 36, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_2910E8", + "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 43, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DD5", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 46, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DBA", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 45, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DC3", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 38, + "y": 9, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DCC", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 50, + "y": 7, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2BD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 27, + "y": 7, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DDE", + "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 16, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E302D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 41, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CEE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 40, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CDD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 16, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CCB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 16, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CD4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 27, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 24, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "dest_warp_id": 0 + }, + { + "x": 24, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 24, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "dest_warp_id": 1 + }, + { + "x": 70, + "y": 5, + "elevation": 1, + "dest_map": "MAP_AQUA_HIDEOUT_1F", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 55, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 22, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D1A" + }, + { + "type": "sign", + "x": 25, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 29, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D6B" + }, + { + "type": "sign", + "x": 26, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2CFF" + }, + { + "type": "sign", + "x": 29, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D08" + }, + { + "type": "sign", + "x": 35, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D11" + }, + { + "type": "sign", + "x": 6, + "y": 30, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D44" + }, + { + "type": "sign", + "x": 36, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D62" + }, + { + "type": "sign", + "x": 34, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D74" + }, + { + "type": "hidden_item", + "x": 36, + "y": 31, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 61, + "y": 7, + "elevation": 0, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP" + }, + { + "type": "hidden_item", + "x": 64, + "y": 31, + "elevation": 0, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc deleted file mode 100644 index 838aec23b9..0000000000 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ /dev/null @@ -1,51 +0,0 @@ -LilycoveCity_ContestHall_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 - object_event 9, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 - object_event 10, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_4, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 - object_event 16, EVENT_OBJ_GFX_TWIN, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 - object_event 18, EVENT_OBJ_GFX_POKEFAN_F, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 - object_event 28, EVENT_OBJ_GFX_EXPERT_F, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 - -LilycoveCity_ContestHall_MapWarps: - warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY - -LilycoveCity_ContestHall_MapBGEvents: - bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C - bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C - -LilycoveCity_ContestHall_MapEvents:: - map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents - diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc deleted file mode 100644 index d450c564e8..0000000000 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestHall: - .4byte LilycoveCity_ContestHall_Layout - .4byte LilycoveCity_ContestHall_MapEvents - .4byte LilycoveCity_ContestHall_MapScripts - .4byte 0x0 - .2byte MUS_CONLOBBY - .2byte LAYOUT_LILYCOVE_CITY_CONTEST_HALL - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json new file mode 100644 index 0000000000..644ec55ee3 --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -0,0 +1,515 @@ +{ + "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "name": "LilycoveCity_ContestHall", + "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", + "music": "MUS_CONLOBBY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 30, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B485", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B48E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 40, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B497", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 12, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4A9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 15, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4C0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B505", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 16, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B51C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B533", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 18, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B56A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 8, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B53C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B581", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 27, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B598", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 26, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 28, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B60B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 30, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B639", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 26, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B622", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B553", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 36, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B650", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 39, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B667", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 34, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B67E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 36, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B695", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 38, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 40, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 32, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 37, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B71C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 42, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B705", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 23, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4A0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 19, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 30, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 27, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B733" + }, + { + "type": "sign", + "x": 39, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B73C" + }, + { + "type": "sign", + "x": 11, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B745" + }, + { + "type": "sign", + "x": 15, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B745" + }, + { + "type": "sign", + "x": 23, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B733" + }, + { + "type": "sign", + "x": 35, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B73C" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc deleted file mode 100644 index 68c682a257..0000000000 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ /dev/null @@ -1,50 +0,0 @@ -LilycoveCity_ContestLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 - object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 - object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 - object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 - -LilycoveCity_ContestLobby_MapWarps: - warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL - warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL - -LilycoveCity_ContestLobby_MapBGEvents: - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink - bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E - bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 - bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A - bg_event 27, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A761 - bg_event 30, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A77A - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C - bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask - bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D - bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 - -LilycoveCity_ContestLobby_MapEvents:: - map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents - diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc deleted file mode 100644 index d00e7190d6..0000000000 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestLobby: - .4byte LilycoveCity_ContestLobby_Layout - .4byte LilycoveCity_ContestLobby_MapEvents - .4byte LilycoveCity_ContestLobby_MapScripts - .4byte 0x0 - .2byte MUS_CONLOBBY - .2byte LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json new file mode 100644 index 0000000000..65571d71ca --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -0,0 +1,472 @@ +{ + "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "name": "LilycoveCity_ContestLobby", + "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", + "music": "MUS_CONLOBBY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A554", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A806", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 26, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 9, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A708", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A711", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A71A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_28CA59", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 23, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A768", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 28, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 21, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A72C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 0, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A723", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A735", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FAB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FBD", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A771", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 27, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7B3", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 28, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7BE", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 28, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7C9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2", + "x": 26, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7D9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7E9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 26, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7A8", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A798", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21ACF1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 4 + }, + { + "x": 15, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_PblockLink" + }, + { + "type": "sign", + "x": 23, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_293E1E" + }, + { + "type": "sign", + "x": 23, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A753" + }, + { + "type": "sign", + "x": 25, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A75A" + }, + { + "type": "sign", + "x": 27, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A761" + }, + { + "type": "sign", + "x": 30, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A77A" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A73E" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A745" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A74C" + }, + { + "type": "sign", + "x": 27, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_Pblock1_Ask" + }, + { + "type": "sign", + "x": 27, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_293D4D" + }, + { + "type": "sign", + "x": 18, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A784" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc deleted file mode 100644 index e769c3c9f1..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 - -LilycoveCity_CoveLilyMotel_1F_MapWarps: - warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY - warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F - -LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: - coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 - -LilycoveCity_CoveLilyMotel_1F_MapEvents:: - map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc deleted file mode 100644 index ab7811a465..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F: - .4byte LilycoveCity_CoveLilyMotel_1F_Layout - .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json new file mode 100644 index 0000000000..f00b407c70 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -0,0 +1,66 @@ +{ + "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "name": "LilycoveCity_CoveLilyMotel_1F", + "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc deleted file mode 100644 index b7f973a847..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT - -LilycoveCity_CoveLilyMotel_2F_MapWarps: - warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - -LilycoveCity_CoveLilyMotel_2F_MapEvents:: - map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc deleted file mode 100644 index 769cd8b0dc..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F: - .4byte LilycoveCity_CoveLilyMotel_2F_Layout - .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json new file mode 100644 index 0000000000..94ae040698 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -0,0 +1,120 @@ +{ + "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "name": "LilycoveCity_CoveLilyMotel_2F", + "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc deleted file mode 100644 index 307cb2d58d..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 - -LilycoveCity_DepartmentStoreElevator_MapWarps: - warp_def 1, 5, 3, 127, MAP_NONE - warp_def 2, 5, 3, 127, MAP_NONE - -LilycoveCity_DepartmentStoreElevator_MapEvents:: - map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc deleted file mode 100644 index 8576dcbf29..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreElevator: - .4byte LilycoveCity_DepartmentStoreElevator_Layout - .4byte LilycoveCity_DepartmentStoreElevator_MapEvents - .4byte LilycoveCity_DepartmentStoreElevator_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json new file mode 100644 index 0000000000..2c22272ac3 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "LilycoveCity_DepartmentStoreElevator", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc deleted file mode 100644 index c44562b060..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 - -LilycoveCity_DepartmentStoreRooftop_MapWarps: - warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F - -LilycoveCity_DepartmentStoreRooftop_MapBGEvents: - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - -LilycoveCity_DepartmentStoreRooftop_MapEvents:: - map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents - diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc deleted file mode 100644 index 775260145a..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop: - .4byte LilycoveCity_DepartmentStoreRooftop_Layout - .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents - .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json new file mode 100644 index 0000000000..784660e368 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "name": "LilycoveCity_DepartmentStoreRooftop", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F", + "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 3, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc deleted file mode 100644 index 12d4726fbe..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LilycoveCity_DepartmentStore_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 - object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 - -LilycoveCity_DepartmentStore_1F_MapWarps: - warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_1F_MapBGEvents: - bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D - -LilycoveCity_DepartmentStore_1F_MapEvents:: - map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents - diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc deleted file mode 100644 index 27ae23d5f5..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_1F: - .4byte LilycoveCity_DepartmentStore_1F_Layout - .4byte LilycoveCity_DepartmentStore_1F_MapEvents - .4byte LilycoveCity_DepartmentStore_1F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json new file mode 100644 index 0000000000..58e400ff46 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -0,0 +1,137 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "name": "LilycoveCity_DepartmentStore_1F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F85D" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc deleted file mode 100644 index 4854c51e96..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 - -LilycoveCity_DepartmentStore_2F_MapWarps: - warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_2F_MapEvents:: - map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc deleted file mode 100644 index 62f5dcab3c..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F: - .4byte LilycoveCity_DepartmentStore_2F_Layout - .4byte LilycoveCity_DepartmentStore_2F_MapEvents - .4byte LilycoveCity_DepartmentStore_2F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json new file mode 100644 index 0000000000..b3fd03f005 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "name": "LilycoveCity_DepartmentStore_2F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc deleted file mode 100644 index 2eed8c39fb..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 - -LilycoveCity_DepartmentStore_3F_MapWarps: - warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_3F_MapEvents:: - map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc deleted file mode 100644 index 624671aea3..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F: - .4byte LilycoveCity_DepartmentStore_3F_Layout - .4byte LilycoveCity_DepartmentStore_3F_MapEvents - .4byte LilycoveCity_DepartmentStore_3F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json new file mode 100644 index 0000000000..e9d5785e63 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "name": "LilycoveCity_DepartmentStore_3F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 1 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc deleted file mode 100644 index 77df01a38d..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 - -LilycoveCity_DepartmentStore_4F_MapWarps: - warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_4F_MapEvents:: - map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc deleted file mode 100644 index df74e3c2f8..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F: - .4byte LilycoveCity_DepartmentStore_4F_Layout - .4byte LilycoveCity_DepartmentStore_4F_MapEvents - .4byte LilycoveCity_DepartmentStore_4F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json new file mode 100644 index 0000000000..b41eecd31f --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "name": "LilycoveCity_DepartmentStore_4F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc deleted file mode 100644 index d4492d7e98..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -LilycoveCity_DepartmentStore_5F_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 - -LilycoveCity_DepartmentStore_5F_MapWarps: - warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP - -LilycoveCity_DepartmentStore_5F_MapEvents:: - map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc deleted file mode 100644 index 938cfc7b8f..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_5F: - .4byte LilycoveCity_DepartmentStore_5F_Layout - .4byte LilycoveCity_DepartmentStore_5F_MapEvents - .4byte LilycoveCity_DepartmentStore_5F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json new file mode 100644 index 0000000000..6ea8bbbf27 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -0,0 +1,134 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "name": "LilycoveCity_DepartmentStore_5F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 17, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc deleted file mode 100644 index ad43f2bf1d..0000000000 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER - -LilycoveCity_Harbor_MapWarps: - warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY - warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY - -LilycoveCity_Harbor_MapEvents:: - map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc deleted file mode 100644 index b332f5df72..0000000000 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_Harbor: - .4byte Harbor_Layout - .4byte LilycoveCity_Harbor_MapEvents - .4byte LilycoveCity_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HARBOR - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json new file mode 100644 index 0000000000..1eb68641ac --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_LILYCOVE_CITY_HARBOR", + "name": "LilycoveCity_Harbor", + "layout": "LAYOUT_HARBOR", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_Harbor_EventScript_21E00F", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_Harbor_EventScript_21E637", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER" + } + ], + "warp_events": [ + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 12 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc deleted file mode 100644 index 31515dae93..0000000000 --- a/data/maps/LilycoveCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LilycoveCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 - -LilycoveCity_House1_MapWarps: - warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY - -LilycoveCity_House1_MapEvents:: - map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc deleted file mode 100644 index 68da92f8a0..0000000000 --- a/data/maps/LilycoveCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House1: - .4byte House1_Layout - .4byte LilycoveCity_House1_MapEvents - .4byte LilycoveCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json new file mode 100644 index 0000000000..b8d59e9531 --- /dev/null +++ b/data/maps/LilycoveCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE1", + "name": "LilycoveCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House1_EventScript_21ECCE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House1_EventScript_21ECD7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc deleted file mode 100644 index e7c1b3cd7c..0000000000 --- a/data/maps/LilycoveCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 - -LilycoveCity_House2_MapWarps: - warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY - warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY - -LilycoveCity_House2_MapEvents:: - map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc deleted file mode 100644 index 93ff11013c..0000000000 --- a/data/maps/LilycoveCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House2: - .4byte LilycoveCity_House2_Layout - .4byte LilycoveCity_House2_MapEvents - .4byte LilycoveCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json new file mode 100644 index 0000000000..87f5a52d9d --- /dev/null +++ b/data/maps/LilycoveCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE2", + "name": "LilycoveCity_House2", + "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House2_EventScript_21ED75", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 9 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc deleted file mode 100644 index 4e577400b7..0000000000 --- a/data/maps/LilycoveCity_House3/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 - object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 - object_event 4, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 - object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 - -LilycoveCity_House3_MapWarps: - warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY - -LilycoveCity_House3_MapEvents:: - map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc deleted file mode 100644 index 3788a2ee9c..0000000000 --- a/data/maps/LilycoveCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House3: - .4byte House2_Layout - .4byte LilycoveCity_House3_MapEvents - .4byte LilycoveCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json new file mode 100644 index 0000000000..78dffc5f0b --- /dev/null +++ b/data/maps/LilycoveCity_House3/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE3", + "name": "LilycoveCity_House3", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EF3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EE4B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EED5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EF09", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EEA1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EE8A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc deleted file mode 100644 index aa586c64fe..0000000000 --- a/data/maps/LilycoveCity_House4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LilycoveCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 - -LilycoveCity_House4_MapWarps: - warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY - -LilycoveCity_House4_MapEvents:: - map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc deleted file mode 100644 index b0ee0ed360..0000000000 --- a/data/maps/LilycoveCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House4: - .4byte House1_Layout - .4byte LilycoveCity_House4_MapEvents - .4byte LilycoveCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json new file mode 100644 index 0000000000..72cd396f02 --- /dev/null +++ b/data/maps/LilycoveCity_House4/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE4", + "name": "LilycoveCity_House4", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House4_EventScript_21F5B5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House4_EventScript_21F5BE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc deleted file mode 100644 index a41748c694..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 - -LilycoveCity_LilycoveMuseum_1F_MapWarps: - warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY - warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F - -LilycoveCity_LilycoveMuseum_1F_MapBGEvents: - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA - bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8 - bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 - bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - -LilycoveCity_LilycoveMuseum_1F_MapEvents:: - map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc deleted file mode 100644 index 7a50114fa0..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F: - .4byte LilycoveCity_LilycoveMuseum_1F_Layout - .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json new file mode 100644 index 0000000000..72f376e23e --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -0,0 +1,302 @@ +{ + "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "name": "LilycoveCity_LilycoveMuseum_1F", + "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 19, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3" + } + ], + "warp_events": [ + { + "x": 9, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 3 + }, + { + "x": 10, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 13 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + }, + { + "type": "sign", + "x": 6, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + }, + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + }, + { + "type": "sign", + "x": 15, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA" + }, + { + "type": "sign", + "x": 11, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8" + }, + { + "type": "sign", + "x": 17, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + }, + { + "type": "sign", + "x": 19, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + }, + { + "type": "sign", + "x": 20, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + }, + { + "type": "sign", + "x": 18, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + }, + { + "type": "sign", + "x": 18, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3" + }, + { + "type": "sign", + "x": 16, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc deleted file mode 100644 index f6969462c4..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - -LilycoveCity_LilycoveMuseum_2F_MapWarps: - warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - -LilycoveCity_LilycoveMuseum_2F_MapBGEvents: - bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - -LilycoveCity_LilycoveMuseum_2F_MapEvents:: - map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc deleted file mode 100644 index f1ba72c036..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F: - .4byte LilycoveCity_LilycoveMuseum_2F_Layout - .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json new file mode 100644 index 0000000000..ab2ae56fb2 --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -0,0 +1,178 @@ +{ + "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "name": "LilycoveCity_LilycoveMuseum_2F", + "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + }, + { + "type": "sign", + "x": 15, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + }, + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + }, + { + "type": "sign", + "x": 19, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + }, + { + "type": "sign", + "x": 18, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + }, + { + "type": "sign", + "x": 6, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + }, + { + "type": "sign", + "x": 7, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + }, + { + "type": "sign", + "x": 11, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + }, + { + "type": "sign", + "x": 15, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc deleted file mode 100644 index 8a606ce7e0..0000000000 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_MoveDeletersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 - -LilycoveCity_MoveDeletersHouse_MapWarps: - warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY - -LilycoveCity_MoveDeletersHouse_MapEvents:: - map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc deleted file mode 100644 index 46a0f964eb..0000000000 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_MoveDeletersHouse: - .4byte House2_Layout - .4byte LilycoveCity_MoveDeletersHouse_MapEvents - .4byte LilycoveCity_MoveDeletersHouse_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json new file mode 100644 index 0000000000..d200fad221 --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", + "name": "LilycoveCity_MoveDeletersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 5a46fe756d..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY - -LilycoveCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY - warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY - warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F - -LilycoveCity_PokemonCenter_1F_MapEvents:: - map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc deleted file mode 100644 index e264b0955f..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte LilycoveCity_PokemonCenter_1F_MapEvents - .4byte LilycoveCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..b58418edd9 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "name": "LilycoveCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7", + "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc deleted file mode 100644 index accbba24d8..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -LilycoveCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -LilycoveCity_PokemonCenter_2F_MapEvents:: - map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bd96ad98ba..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte LilycoveCity_PokemonCenter_2F_MapEvents - .4byte LilycoveCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..346a911732 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", + "name": "LilycoveCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc deleted file mode 100644 index f5755f50f5..0000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, FLAG_HIDE_FANCLUB_LITTLE_BOY - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, FLAG_HIDE_FANCLUB_BOY - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, FLAG_HIDE_FANCLUB_LADY - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER - -LilycoveCity_PokemonTrainerFanClub_MapWarps: - warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY - warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY - -LilycoveCity_PokemonTrainerFanClub_MapEvents:: - map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc deleted file mode 100644 index 61f306b69e..0000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub: - .4byte LilycoveCity_PokemonTrainerFanClub_Layout - .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents - .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json new file mode 100644 index 0000000000..b48876cce0 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "LilycoveCity_PokemonTrainerFanClub", + "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3", + "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55", + "flag": "FLAG_HIDE_FANCLUB_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7", + "flag": "FLAG_HIDE_FANCLUB_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19", + "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B", + "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc deleted file mode 100644 index 5a4eeaac9e..0000000000 --- a/data/maps/LilycoveCity_UnusedMart/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -LilycoveCity_UnusedMart_MapWarps: - warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY - -LilycoveCity_UnusedMart_MapEvents:: - map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc deleted file mode 100644 index 1885305313..0000000000 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_UnusedMart: - .4byte Mart_Layout - .4byte LilycoveCity_UnusedMart_MapEvents - .4byte LilycoveCity_UnusedMart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json new file mode 100644 index 0000000000..44cd20815a --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_LILYCOVE_CITY_UNUSED_MART", + "name": "LilycoveCity_UnusedMart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc deleted file mode 100644 index d8a0e93d37..0000000000 --- a/data/maps/LinkContestRoom1/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LinkContestRoom1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_POKE_BALL - object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -LinkContestRoom1_MapEvents:: - map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc deleted file mode 100644 index 24a33fdfc9..0000000000 --- a/data/maps/LinkContestRoom1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom1: - .4byte LinkContestRoom1_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM1 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json new file mode 100644 index 0000000000..538b0af697 --- /dev/null +++ b/data/maps/LinkContestRoom1/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM1", + "name": "LinkContestRoom1", + "layout": "LAYOUT_LINK_CONTEST_ROOM1", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_LINK_CONTEST_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom2/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc deleted file mode 100644 index 50d0a74255..0000000000 --- a/data/maps/LinkContestRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom2: - .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM2 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json new file mode 100644 index 0000000000..b02da178f2 --- /dev/null +++ b/data/maps/LinkContestRoom2/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM2", + "name": "LinkContestRoom2", + "layout": "LAYOUT_LINK_CONTEST_ROOM2", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom3/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc deleted file mode 100644 index 06f9ffd19b..0000000000 --- a/data/maps/LinkContestRoom3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom3: - .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM3 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json new file mode 100644 index 0000000000..fb0bf29e03 --- /dev/null +++ b/data/maps/LinkContestRoom3/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM3", + "name": "LinkContestRoom3", + "layout": "LAYOUT_LINK_CONTEST_ROOM3", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom4/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc deleted file mode 100644 index eba4cb0bd0..0000000000 --- a/data/maps/LinkContestRoom4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom4: - .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM4 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json new file mode 100644 index 0000000000..85d12ece4e --- /dev/null +++ b/data/maps/LinkContestRoom4/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM4", + "name": "LinkContestRoom4", + "layout": "LAYOUT_LINK_CONTEST_ROOM4", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom5/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc deleted file mode 100644 index 12ec2d40d7..0000000000 --- a/data/maps/LinkContestRoom5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom5: - .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM5 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json new file mode 100644 index 0000000000..f312d4c2b3 --- /dev/null +++ b/data/maps/LinkContestRoom5/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM5", + "name": "LinkContestRoom5", + "layout": "LAYOUT_LINK_CONTEST_ROOM5", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom6/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc deleted file mode 100644 index 77f1c14c71..0000000000 --- a/data/maps/LinkContestRoom6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom6: - .4byte LinkContestRoom6_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM6 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json new file mode 100644 index 0000000000..38bfcd9798 --- /dev/null +++ b/data/maps/LinkContestRoom6/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM6", + "name": "LinkContestRoom6", + "layout": "LAYOUT_LINK_CONTEST_ROOM6", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc deleted file mode 100644 index bfd3b0ab78..0000000000 --- a/data/maps/LittlerootTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -LittlerootTown_MapConnectionsList: - connection up, 0, MAP_ROUTE101 - -LittlerootTown_MapConnections: - .4byte 1 - .4byte LittlerootTown_MapConnectionsList - diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc deleted file mode 100644 index 3d81193b09..0000000000 --- a/data/maps/LittlerootTown/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LittlerootTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK - object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH - -LittlerootTown_MapWarps: - warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F - warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB - -LittlerootTown_MapCoordEvents: - coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091 - coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF - coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F - coord_event 8, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81F9 - coord_event 9, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E8205 - coord_event 10, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81E1 - coord_event 11, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81ED - coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB - coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE - -LittlerootTown_MapBGEvents: - bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151 - bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A - bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163 - bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F - -LittlerootTown_MapEvents:: - map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents - diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc deleted file mode 100644 index c1565535c3..0000000000 --- a/data/maps/LittlerootTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown: - .4byte LittlerootTown_Layout - .4byte LittlerootTown_MapEvents - .4byte LittlerootTown_MapScripts - .4byte LittlerootTown_MapConnections - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json new file mode 100644 index 0000000000..28decfc87f --- /dev/null +++ b/data/maps/LittlerootTown/map.json @@ -0,0 +1,268 @@ +{ + "id": "MAP_LITTLEROOT_TOWN", + "name": "LittlerootTown", + "layout": "LAYOUT_LITTLEROOT_TOWN", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE101" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E8034", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E8022", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 14, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E802B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E863D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "x": 2, + "y": 10, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "x": 11, + "y": 10, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCH" + } + ], + "warp_events": [ + { + "x": 14, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "LittlerootTown_EventScript_1E8091" + }, + { + "type": "trigger", + "x": 11, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "LittlerootTown_EventScript_1E80EF" + }, + { + "type": "trigger", + "x": 11, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 1, + "script": "LittlerootTown_EventScript_1E811F" + }, + { + "type": "trigger", + "x": 8, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81F9" + }, + { + "type": "trigger", + "x": 9, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E8205" + }, + { + "type": "trigger", + "x": 10, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81E1" + }, + { + "type": "trigger", + "x": 11, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81ED" + }, + { + "type": "trigger", + "x": 10, + "y": 2, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81BB" + }, + { + "type": "trigger", + "x": 11, + "y": 2, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81CE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E8151" + }, + { + "type": "sign", + "x": 6, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E815A" + }, + { + "type": "sign", + "x": 7, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E8163" + }, + { + "type": "sign", + "x": 12, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E818F" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc deleted file mode 100644 index ad4d1a4a67..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -LittlerootTown_BrendansHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM - object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN - -LittlerootTown_BrendansHouse_1F_MapWarps: - warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN - warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN - warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - -LittlerootTown_BrendansHouse_1F_MapCoordEvents: - coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 - coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE - coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA - coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 - -LittlerootTown_BrendansHouse_1F_MapEvents:: - map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc deleted file mode 100644 index 44b861056a..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_1F: - .4byte LittlerootTown_BrendansHouse_1F_Layout - .4byte LittlerootTown_BrendansHouse_1F_MapEvents - .4byte LittlerootTown_BrendansHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json new file mode 100644 index 0000000000..79f3c75a8d --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -0,0 +1,171 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "name": "LittlerootTown_BrendansHouse_1F", + "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 3, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN" + } + ], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 8, + "elevation": 0, + "var": "VAR_0x4092", + "var_value": 4, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" + }, + { + "type": "trigger", + "x": 7, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" + }, + { + "type": "trigger", + "x": 8, + "y": 4, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" + }, + { + "type": "trigger", + "x": 9, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc deleted file mode 100644 index 29dddeb6a4..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -LittlerootTown_BrendansHouse_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL - -LittlerootTown_BrendansHouse_2F_MapWarps: - warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - -LittlerootTown_BrendansHouse_2F_MapBGEvents: - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F - -LittlerootTown_BrendansHouse_2F_MapEvents:: - map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents - diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc deleted file mode 100644 index 5bf1113dd4..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_2F: - .4byte LittlerootTown_BrendansHouse_2F_Layout - .4byte LittlerootTown_BrendansHouse_2F_MapEvents - .4byte LittlerootTown_BrendansHouse_2F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json new file mode 100644 index 0000000000..4adc283881 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -0,0 +1,270 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "name": "LittlerootTown_BrendansHouse_2F", + "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 1, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 7, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWABLU_DOLL", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL" + } + ], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EventScript_PlayerPCMale" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8656" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_292781" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F865F" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc deleted file mode 100644 index 890a6a6240..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -LittlerootTown_MaysHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM - object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN - -LittlerootTown_MaysHouse_1F_MapWarps: - warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN - warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN - warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F - -LittlerootTown_MaysHouse_1F_MapCoordEvents: - coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C - coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 - coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 - coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F - -LittlerootTown_MaysHouse_1F_MapEvents:: - map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc deleted file mode 100644 index 9ab1d2f8b0..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_1F: - .4byte LittlerootTown_MaysHouse_1F_Layout - .4byte LittlerootTown_MaysHouse_1F_MapEvents - .4byte LittlerootTown_MaysHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json new file mode 100644 index 0000000000..817def8b2a --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -0,0 +1,171 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "name": "LittlerootTown_MaysHouse_1F", + "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 2, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 8, + "elevation": 0, + "var": "VAR_0x4092", + "var_value": 4, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" + }, + { + "type": "trigger", + "x": 1, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" + }, + { + "type": "trigger", + "x": 2, + "y": 4, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc deleted file mode 100644 index b845971ece..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -LittlerootTown_MaysHouse_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - -LittlerootTown_MaysHouse_2F_MapWarps: - warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F - -LittlerootTown_MaysHouse_2F_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale - -LittlerootTown_MaysHouse_2F_MapEvents:: - map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents - diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc deleted file mode 100644 index d68d04d0d9..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_2F: - .4byte LittlerootTown_MaysHouse_2F_Layout - .4byte LittlerootTown_MaysHouse_2F_MapEvents - .4byte LittlerootTown_MaysHouse_2F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json new file mode 100644 index 0000000000..be1329fbdd --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -0,0 +1,270 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "name": "LittlerootTown_MaysHouse_2F", + "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 2, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "x": 3, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL" + } + ], + "warp_events": [ + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F865F" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F8656" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_29278D" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_PlayerPCFemale" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc deleted file mode 100644 index 94baaed20f..0000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA - -LittlerootTown_ProfessorBirchsLab_MapWarps: - warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN - warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN - -LittlerootTown_ProfessorBirchsLab_MapBGEvents: - bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - -LittlerootTown_ProfessorBirchsLab_MapEvents:: - map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents - diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc deleted file mode 100644 index 3cbfbdca73..0000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_ProfessorBirchsLab: - .4byte LittlerootTown_ProfessorBirchsLab_Layout - .4byte LittlerootTown_ProfessorBirchsLab_MapEvents - .4byte LittlerootTown_ProfessorBirchsLab_MapScripts - .4byte 0x0 - .2byte MUS_ODAMAKI - .2byte LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json new file mode 100644 index 0000000000..2b29f99c1f --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -0,0 +1,235 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "name": "LittlerootTown_ProfessorBirchsLab", + "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "music": "MUS_ODAMAKI", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 12, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + }, + { + "type": "sign", + "x": 11, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 0, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 4, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 1, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 1, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 11, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ee7e1730b5..b47df74b8a 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 - setmaplayoutindex 432 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 - setmaplayoutindex 432 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc deleted file mode 100644 index 4ee4905b6f..0000000000 --- a/data/maps/MagmaHideout_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MagmaHideout_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13 - -MagmaHideout_1F_MapWarps: - warp_def 10, 34, 3, 4, MAP_JAGGED_PASS - warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R - warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R - warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R - -MagmaHideout_1F_MapEvents:: - map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc deleted file mode 100644 index 2f509f088d..0000000000 --- a/data/maps/MagmaHideout_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_1F: - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_1F_MapEvents - .4byte MagmaHideout_1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_1F - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json new file mode 100644 index 0000000000..2d07a723a7 --- /dev/null +++ b/data/maps/MagmaHideout_1F/map.json @@ -0,0 +1,128 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_1F", + "name": "MagmaHideout_1F", + "layout": "LAYOUT_MAGMA_HIDEOUT_1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MagmaHideout_1F_EventScript_23988C", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2914DE", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 30, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_1F_EventScript_2398A3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + } + ], + "warp_events": [ + { + "x": 10, + "y": 34, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 4 + }, + { + "x": 25, + "y": 34, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 22, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc deleted file mode 100644 index e88bde8849..0000000000 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -MagmaHideout_2F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - -MagmaHideout_2F_1R_MapWarps: - warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R - warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F - warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R - -MagmaHideout_2F_1R_MapEvents:: - map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc deleted file mode 100644 index 29de6cac75..0000000000 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_1R: - .4byte MagmaHideout_2F_1R_Layout - .4byte MagmaHideout_2F_1R_MapEvents - .4byte MagmaHideout_2F_1R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_1R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json new file mode 100644 index 0000000000..75db41221a --- /dev/null +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_1R", + "name": "MagmaHideout_2F_1R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_1R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 18, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 5, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MagmaHideout_2F_1R_EventScript_239B7F", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 7, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_2F_1R_EventScript_239B96", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "MagmaHideout_2F_1R_EventScript_239B51", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_2F_1R_EventScript_239B68", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 11, + "y": 23, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 33, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc deleted file mode 100644 index 70b234139d..0000000000 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE - -MagmaHideout_2F_2R_MapWarps: - warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R - warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F - -MagmaHideout_2F_2R_MapEvents:: - map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc deleted file mode 100644 index 4606ef07b5..0000000000 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R: - .4byte MagmaHideout_2F_2R_Layout - .4byte MagmaHideout_2F_2R_MapEvents - .4byte MagmaHideout_2F_2R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_2R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json new file mode 100644 index 0000000000..af80ea8ff7 --- /dev/null +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_2R", + "name": "MagmaHideout_2F_2R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_2R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 29, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "MagmaHideout_2F_2R_EventScript_239E4D", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MagmaHideout_2F_2R_EventScript_239E36", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 21, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_2F_2R_EventScript_2914EB", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_2F_2R_EventScript_239E1F", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MagmaHideout_2F_2R_EventScript_239E08", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_2F_2R_EventScript_2914F8", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE" + } + ], + "warp_events": [ + { + "x": 10, + "y": 22, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc deleted file mode 100644 index 5b12929d81..0000000000 --- a/data/maps/MagmaHideout_2F_3R/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MagmaHideout_2F_3R_MapWarps: - warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F - warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R - -MagmaHideout_2F_3R_MapEvents:: - map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc deleted file mode 100644 index dd1d0d9e78..0000000000 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_3R: - .4byte MagmaHideout_2F_3R_Layout - .4byte MagmaHideout_2F_3R_MapEvents - .4byte MagmaHideout_2F_3R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_3R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json new file mode 100644 index 0000000000..186fa9dd82 --- /dev/null +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_3R", + "name": "MagmaHideout_2F_3R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc deleted file mode 100644 index 166e88b275..0000000000 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MagmaHideout_3F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET - -MagmaHideout_3F_1R_MapWarps: - warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F - warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R - warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R - -MagmaHideout_3F_1R_MapEvents:: - map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc deleted file mode 100644 index ac8d5d9b4a..0000000000 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_1R: - .4byte MagmaHideout_3F_1R_Layout - .4byte MagmaHideout_3F_1R_MapEvents - .4byte MagmaHideout_3F_1R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_1R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json new file mode 100644 index 0000000000..ec61d27591 --- /dev/null +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_1R", + "name": "MagmaHideout_3F_1R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_1R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 2, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "MagmaHideout_3F_1R_EventScript_23A1B3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 21, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_3F_1R_EventScript_23A1CA", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_1R_EventScript_291505", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET" + } + ], + "warp_events": [ + { + "x": 7, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_4F", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_2R", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc deleted file mode 100644 index 825e8985e9..0000000000 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MagmaHideout_3F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX - -MagmaHideout_3F_2R_MapWarps: - warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R - -MagmaHideout_3F_2R_MapEvents:: - map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc deleted file mode 100644 index 8fbb30b18a..0000000000 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_2R: - .4byte MagmaHideout_3F_2R_Layout - .4byte MagmaHideout_3F_2R_MapEvents - .4byte MagmaHideout_3F_2R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_2R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json new file mode 100644 index 0000000000..23e8d0b8ca --- /dev/null +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_2R", + "name": "MagmaHideout_3F_2R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_2R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 16, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_3F_2R_EventScript_23A3D5", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_2R_EventScript_291512", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX" + } + ], + "warp_events": [ + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc deleted file mode 100644 index d4346a1390..0000000000 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MagmaHideout_3F_3R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE - -MagmaHideout_3F_3R_MapWarps: - warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R - warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F - -MagmaHideout_3F_3R_MapEvents:: - map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc deleted file mode 100644 index c676fac3dd..0000000000 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_3R: - .4byte MagmaHideout_3F_3R_Layout - .4byte MagmaHideout_3F_3R_MapEvents - .4byte MagmaHideout_3F_3R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_3R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json new file mode 100644 index 0000000000..40921b8ca9 --- /dev/null +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_3R", + "name": "MagmaHideout_3F_3R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_3R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 19, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_3R_EventScript_29152C", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R", + "dest_warp_id": 1 + }, + { + "x": 16, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc deleted file mode 100644 index 2fd71b3db0..0000000000 --- a/data/maps/MagmaHideout_4F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MagmaHideout_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE - -MagmaHideout_4F_MapWarps: - warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R - warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R - -MagmaHideout_4F_MapEvents:: - map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc deleted file mode 100644 index 82a3e66bb8..0000000000 --- a/data/maps/MagmaHideout_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_4F: - .4byte MagmaHideout_4F_Layout - .4byte MagmaHideout_4F_MapEvents - .4byte MagmaHideout_4F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_4F - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json new file mode 100644 index 0000000000..dcec4fdb9f --- /dev/null +++ b/data/maps/MagmaHideout_4F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_4F", + "name": "MagmaHideout_4F", + "layout": "LAYOUT_MAGMA_HIDEOUT_4F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "x": 16, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 31, + "y": 22, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A68C", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 30, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A6A3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 26, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A6BA", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 22, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_4F_EventScript_23A6D1", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 16, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_4F_EventScript_23A560", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_2", + "x": 16, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_4F_EventScript_29151F", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE" + } + ], + "warp_events": [ + { + "x": 46, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc deleted file mode 100644 index 4a97b9f15f..0000000000 --- a/data/maps/MarineCave_End/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MarineCave_End_EventObjects: - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE - -MarineCave_End_MapWarps: - warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE - -MarineCave_End_MapCoordEvents: - coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B - -MarineCave_End_MapEvents:: - map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc deleted file mode 100644 index e2377aa4b1..0000000000 --- a/data/maps/MarineCave_End/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_End: - .4byte MarineCave_End_Layout - .4byte MarineCave_End_MapEvents - .4byte MarineCave_End_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_MARINE_CAVE_END - .byte MAPSEC_MARINE_CAVE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json new file mode 100644 index 0000000000..017adcc9a3 --- /dev/null +++ b/data/maps/MarineCave_End/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_MARINE_CAVE_END", + "name": "MarineCave_End", + "layout": "LAYOUT_MARINE_CAVE_END", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "x": 9, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MARINE_CAVE_KYOGRE" + } + ], + "warp_events": [ + { + "x": 20, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MARINE_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "MarineCave_End_EventScript_23B01B" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc deleted file mode 100644 index 9e96bf2257..0000000000 --- a/data/maps/MarineCave_Entrance/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -MarineCave_Entrance_MapWarps: - warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END - -MarineCave_Entrance_MapEvents:: - map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc deleted file mode 100644 index a1ce8ac617..0000000000 --- a/data/maps/MarineCave_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_Entrance: - .4byte MarineCave_Entrance_Layout - .4byte MarineCave_Entrance_MapEvents - .4byte MarineCave_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_MARINE_CAVE_ENTRANCE - .byte MAPSEC_MARINE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json new file mode 100644 index 0000000000..545fe1c9bd --- /dev/null +++ b/data/maps/MarineCave_Entrance/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_MARINE_CAVE_ENTRANCE", + "name": "MarineCave_Entrance", + "layout": "LAYOUT_MARINE_CAVE_ENTRANCE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 14, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MARINE_CAVE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc deleted file mode 100644 index 97f97982c3..0000000000 --- a/data/maps/MauvilleCity/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_MapConnectionsList: - connection up, 0, MAP_ROUTE111 - connection down, 0, MAP_ROUTE110 - connection left, 0, MAP_ROUTE117 - connection right, 0, MAP_ROUTE118 - -MauvilleCity_MapConnections: - .4byte 4 - .4byte MauvilleCity_MapConnectionsList - diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc deleted file mode 100644 index 961eb40053..0000000000 --- a/data/maps/MauvilleCity/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -MauvilleCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, FLAG_HIDE_MAUVILLE_CITY_WALLY - object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, FLAG_HIDE_MAUVILLE_CITY_WATTSON - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, FLAG_ITEM_MAUVILLE_CITY_X_SPEED - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT - -MauvilleCity_MapWarps: - warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM - warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP - warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART - warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1 - warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER - warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 - -MauvilleCity_MapBGEvents: - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 - bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0 - bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A - bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A - bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3D7 - bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9 - bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2 - -MauvilleCity_MapEvents:: - map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents - diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc deleted file mode 100644 index 566eb49e73..0000000000 --- a/data/maps/MauvilleCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity: - .4byte MauvilleCity_Layout - .4byte MauvilleCity_MapEvents - .4byte MauvilleCity_MapScripts - .4byte MauvilleCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_MAUVILLE_CITY - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json new file mode 100644 index 0000000000..4ee667f2b1 --- /dev/null +++ b/data/maps/MauvilleCity/map.json @@ -0,0 +1,300 @@ +{ + "id": "MAP_MAUVILLE_CITY", + "name": "MauvilleCity", + "layout": "LAYOUT_MAUVILLE_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE111" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE110" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE117" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE118" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 29, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3C5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 17, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF452", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF41D", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "x": 29, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF73A", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 28, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_2910CE", + "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_2C7F7E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 8, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_BIKE_SHOP", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 13, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_GAME_CORNER", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3E0" + }, + { + "type": "sign", + "x": 24, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 25, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 24, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3D7" + }, + { + "type": "sign", + "x": 33, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3E9" + }, + { + "type": "sign", + "x": 11, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3F2" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc deleted file mode 100644 index ac9abae2a6..0000000000 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 - -MauvilleCity_BikeShop_MapWarps: - warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY - -MauvilleCity_BikeShop_MapBGEvents: - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A - bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE - -MauvilleCity_BikeShop_MapEvents:: - map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents - diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc deleted file mode 100644 index 244439fed5..0000000000 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop: - .4byte MauvilleCity_BikeShop_Layout - .4byte MauvilleCity_BikeShop_MapEvents - .4byte MauvilleCity_BikeShop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MAUVILLE_CITY_BIKE_SHOP - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json new file mode 100644 index 0000000000..c774718f04 --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", + "name": "MauvilleCity_BikeShop", + "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_BikeShop_EventScript_20EBBC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_BikeShop_EventScript_20ED31", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_BikeShop_EventScript_20ED3A" + }, + { + "type": "sign", + "x": 11, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_BikeShop_EventScript_20EDAE" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc deleted file mode 100644 index c5ef3b7f6a..0000000000 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ /dev/null @@ -1,47 +0,0 @@ -MauvilleCity_GameCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 - object_event 6, EVENT_OBJ_GFX_POKEFAN_M, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 - object_event 10, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 - -MauvilleCity_GameCorner_MapWarps: - warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY - warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY - -MauvilleCity_GameCorner_MapBGEvents: - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6 - bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6 - bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316 - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210336 - bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210356 - bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210376 - bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210396 - bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103B6 - bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103D6 - bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_2103F6 - bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210416 - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210436 - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - -MauvilleCity_GameCorner_MapEvents:: - map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents - diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc deleted file mode 100644 index f13c98c776..0000000000 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_GameCorner: - .4byte MauvilleCity_GameCorner_Layout - .4byte MauvilleCity_GameCorner_MapEvents - .4byte MauvilleCity_GameCorner_MapScripts - .4byte 0x0 - .2byte MUS_CASINO - .2byte LAYOUT_MAUVILLE_CITY_GAME_CORNER - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json new file mode 100644 index 0000000000..696694a6bc --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -0,0 +1,385 @@ +{ + "id": "MAP_MAUVILLE_CITY_GAME_CORNER", + "name": "MauvilleCity_GameCorner", + "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", + "music": "MUS_CASINO", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210125", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_21012E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FBB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FCF1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210137", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_21021D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 20, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210279", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210289", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FE9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210299", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_2102B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_2102C6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 5 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2102D6" + }, + { + "type": "sign", + "x": 2, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2102F6" + }, + { + "type": "sign", + "x": 2, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_210316" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210336" + }, + { + "type": "sign", + "x": 3, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210356" + }, + { + "type": "sign", + "x": 3, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210376" + }, + { + "type": "sign", + "x": 7, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_210396" + }, + { + "type": "sign", + "x": 7, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2103B6" + }, + { + "type": "sign", + "x": 7, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2103D6" + }, + { + "type": "sign", + "x": 8, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_2103F6" + }, + { + "type": "sign", + "x": 8, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210416" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210436" + }, + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 14, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 14, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 18, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 18, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc deleted file mode 100644 index 10c3c039d6..0000000000 --- a/data/maps/MauvilleCity_Gym/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -MauvilleCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 - -MauvilleCity_Gym_MapWarps: - warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY - warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY - -MauvilleCity_Gym_MapCoordEvents: - coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E - coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043 - coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9 - coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068 - -MauvilleCity_Gym_MapBGEvents: - bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B - bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B - -MauvilleCity_Gym_MapEvents:: - map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents - diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc deleted file mode 100644 index 5f9666eeba..0000000000 --- a/data/maps/MauvilleCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Gym: - .4byte MauvilleCity_Gym_Layout - .4byte MauvilleCity_Gym_MapEvents - .4byte MauvilleCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_MAUVILLE_CITY_GYM - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json new file mode 100644 index 0000000000..2ae4cb474e --- /dev/null +++ b/data/maps/MauvilleCity_Gym/map.json @@ -0,0 +1,181 @@ +{ + "id": "MAP_MAUVILLE_CITY_GYM", + "name": "MauvilleCity_Gym", + "layout": "LAYOUT_MAUVILLE_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "x": 5, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Gym_EventScript_20DEEB", + "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MauvilleCity_Gym_EventScript_20E0D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 1, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 5, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0B9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 7, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Gym_EventScript_20E12C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MauvilleCity_Gym_EventScript_20E115", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E01E" + }, + { + "type": "trigger", + "x": 3, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E043" + }, + { + "type": "trigger", + "x": 0, + "y": 15, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20DFF9" + }, + { + "type": "trigger", + "x": 8, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E068" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_Gym_EventScript_20E14B" + }, + { + "type": "sign", + "x": 6, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_Gym_EventScript_20E15B" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc deleted file mode 100644 index 19b88a97eb..0000000000 --- a/data/maps/MauvilleCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 - -MauvilleCity_House1_MapWarps: - warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY - -MauvilleCity_House1_MapEvents:: - map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc deleted file mode 100644 index c36670be5d..0000000000 --- a/data/maps/MauvilleCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_House1: - .4byte House2_Layout - .4byte MauvilleCity_House1_MapEvents - .4byte MauvilleCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json new file mode 100644 index 0000000000..ec2d63cf91 --- /dev/null +++ b/data/maps/MauvilleCity_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAUVILLE_CITY_HOUSE1", + "name": "MauvilleCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_House1_EventScript_20F976", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc deleted file mode 100644 index a27fec0424..0000000000 --- a/data/maps/MauvilleCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 - -MauvilleCity_House2_MapWarps: - warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY - -MauvilleCity_House2_MapEvents:: - map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc deleted file mode 100644 index 60fc3ae22c..0000000000 --- a/data/maps/MauvilleCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_House2: - .4byte House1_Layout - .4byte MauvilleCity_House2_MapEvents - .4byte MauvilleCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json new file mode 100644 index 0000000000..f29a2a34c2 --- /dev/null +++ b/data/maps/MauvilleCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAUVILLE_CITY_HOUSE2", + "name": "MauvilleCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_House2_EventScript_210C5D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc deleted file mode 100644 index 1a5f9a3b75..0000000000 --- a/data/maps/MauvilleCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MauvilleCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 - -MauvilleCity_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY - -MauvilleCity_Mart_MapEvents:: - map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc deleted file mode 100644 index b986d7e3b5..0000000000 --- a/data/maps/MauvilleCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Mart: - .4byte Mart_Layout - .4byte MauvilleCity_Mart_MapEvents - .4byte MauvilleCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json new file mode 100644 index 0000000000..23b451ae26 --- /dev/null +++ b/data/maps/MauvilleCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MAUVILLE_CITY_MART", + "name": "MauvilleCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_2110E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_21111C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_211125", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc deleted file mode 100644 index f97d611365..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 - -MauvilleCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY - warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY - warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F - -MauvilleCity_PokemonCenter_1F_MapEvents:: - map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 623cd61e6d..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte MauvilleCity_PokemonCenter_1F_MapEvents - .4byte MauvilleCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..3e63670aba --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "name": "MauvilleCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc deleted file mode 100644 index b4b2d15ba3..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 - -MauvilleCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -MauvilleCity_PokemonCenter_2F_MapEvents:: - map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bde4b43765..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte MauvilleCity_PokemonCenter_2F_MapEvents - .4byte MauvilleCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..956868d684 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", + "name": "MauvilleCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc deleted file mode 100644 index 63c17fc0df..0000000000 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -MeteorFalls_1F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO - -MeteorFalls_1F_1R_MapWarps: - warp_def 27, 18, 4, 0, MAP_ROUTE114 - warp_def 6, 39, 3, 0, MAP_ROUTE115 - warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R - warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R - warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R - warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE - -MeteorFalls_1F_1R_MapCoordEvents: - coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F - -MeteorFalls_1F_1R_MapBGEvents: - bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 - -MeteorFalls_1F_1R_MapEvents:: - map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents - diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc deleted file mode 100644 index 5bffcd6bad..0000000000 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_1R: - .4byte MeteorFalls_1F_1R_Layout - .4byte MeteorFalls_1F_1R_MapEvents - .4byte MeteorFalls_1F_1R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_1F_1R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json new file mode 100644 index 0000000000..c7611f2fd4 --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -0,0 +1,213 @@ +{ + "id": "MAP_METEOR_FALLS_1F_1R", + "name": "MeteorFalls_1F_1R", + "layout": "LAYOUT_METEOR_FALLS_1F_1R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911AB", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911C5", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911B8", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911D2", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 14, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 6, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_22BF25", + "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO" + } + ], + "warp_events": [ + { + "x": 27, + "y": 18, + "elevation": 4, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 39, + "elevation": 3, + "dest_map": "MAP_ROUTE115", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 28, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 2, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_STEVENS_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 18, + "elevation": 4, + "var": "VAR_0x40BF", + "var_value": 0, + "script": "MeteorFalls_1F_1R_EventScript_22BD5F" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 58, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "0x0" + } + ] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc deleted file mode 100644 index fe845ae674..0000000000 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MeteorFalls_1F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 - -MeteorFalls_1F_2R_MapWarps: - warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R - warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R - warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R - warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R - -MeteorFalls_1F_2R_MapBGEvents: - bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 - -MeteorFalls_1F_2R_MapEvents:: - map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents - diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc deleted file mode 100644 index 4ee1d78c96..0000000000 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_2R: - .4byte MeteorFalls_1F_2R_Layout - .4byte MeteorFalls_1F_2R_MapEvents - .4byte MeteorFalls_1F_2R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_1F_2R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json new file mode 100644 index 0000000000..f1e47c9868 --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_METEOR_FALLS_1F_2R", + "name": "MeteorFalls_1F_2R", + "layout": "LAYOUT_METEOR_FALLS_1F_2R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C4DE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C540", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C5A4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 29, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 14, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 20, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 23, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 58, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "0x0" + } + ] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc deleted file mode 100644 index 1407f4e99a..0000000000 --- a/data/maps/MeteorFalls_B1F_1R/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MeteorFalls_B1F_1R_MapWarps: - warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R - warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R - warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R - warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R - warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R - warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R - -MeteorFalls_B1F_1R_MapEvents:: - map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc deleted file mode 100644 index 9ae4d6e684..0000000000 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_1R: - .4byte MeteorFalls_B1F_1R_Layout - .4byte MeteorFalls_B1F_1R_MapEvents - .4byte MeteorFalls_B1F_1R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_B1F_1R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json new file mode 100644 index 0000000000..c234bd8b8d --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_METEOR_FALLS_B1F_1R", + "name": "MeteorFalls_B1F_1R", + "layout": "LAYOUT_METEOR_FALLS_B1F_1R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 4, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 11, + "elevation": 5, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 15, + "elevation": 4, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 3, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_2R", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 23, + "elevation": 5, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 36, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc deleted file mode 100644 index fb1826f6e6..0000000000 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MeteorFalls_B1F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 - -MeteorFalls_B1F_2R_MapWarps: - warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R - -MeteorFalls_B1F_2R_MapEvents:: - map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc deleted file mode 100644 index d48c61b6d6..0000000000 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_2R: - .4byte MeteorFalls_B1F_2R_Layout - .4byte MeteorFalls_B1F_2R_MapEvents - .4byte MeteorFalls_B1F_2R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_B1F_2R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json new file mode 100644 index 0000000000..527813efb3 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_METEOR_FALLS_B1F_2R", + "name": "MeteorFalls_B1F_2R", + "layout": "LAYOUT_METEOR_FALLS_B1F_2R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_B1F_2R_EventScript_2911DF", + "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02" + } + ], + "warp_events": [ + { + "x": 5, + "y": 15, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc deleted file mode 100644 index c9fcf8bd39..0000000000 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MeteorFalls_StevensCave_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 - -MeteorFalls_StevensCave_MapWarps: - warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R - -MeteorFalls_StevensCave_MapEvents:: - map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc deleted file mode 100644 index c615b53dea..0000000000 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_StevensCave: - .4byte MeteorFalls_StevensCave_Layout - .4byte MeteorFalls_StevensCave_MapEvents - .4byte MeteorFalls_StevensCave_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_STEVENS_CAVE - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json new file mode 100644 index 0000000000..b3d696c8e4 --- /dev/null +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_METEOR_FALLS_STEVENS_CAVE", + "name": "MeteorFalls_StevensCave", + "layout": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 19, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_StevensCave_EventScript_23B182", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 29, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc deleted file mode 100644 index f797b84c88..0000000000 --- a/data/maps/MirageTower_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_1F_MapWarps: - warp_def 10, 14, 3, 3, MAP_ROUTE111 - warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F - -MirageTower_1F_MapEvents:: - map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc deleted file mode 100644 index 67035316ec..0000000000 --- a/data/maps/MirageTower_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_1F: - .4byte MirageTower_1F_Layout - .4byte MirageTower_1F_MapEvents - .4byte MirageTower_1F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_1F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json new file mode 100644 index 0000000000..886e0bf88a --- /dev/null +++ b/data/maps/MirageTower_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MIRAGE_TOWER_1F", + "name": "MirageTower_1F", + "layout": "LAYOUT_MIRAGE_TOWER_1F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc deleted file mode 100644 index 6cbb1fb37e..0000000000 --- a/data/maps/MirageTower_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_2F_MapWarps: - warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F - warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F - -MirageTower_2F_MapEvents:: - map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc deleted file mode 100644 index 65a5c46650..0000000000 --- a/data/maps/MirageTower_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_2F: - .4byte MirageTower_2F_Layout - .4byte MirageTower_2F_MapEvents - .4byte MirageTower_2F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_2F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json new file mode 100644 index 0000000000..d8953d3da3 --- /dev/null +++ b/data/maps/MirageTower_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MIRAGE_TOWER_2F", + "name": "MirageTower_2F", + "layout": "LAYOUT_MIRAGE_TOWER_2F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc deleted file mode 100644 index 9fbc189dd1..0000000000 --- a/data/maps/MirageTower_3F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12 - -MirageTower_3F_MapWarps: - warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F - warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F - -MirageTower_3F_MapEvents:: - map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc deleted file mode 100644 index 565ff1f6d4..0000000000 --- a/data/maps/MirageTower_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_3F: - .4byte MirageTower_3F_Layout - .4byte MirageTower_3F_MapEvents - .4byte MirageTower_3F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_3F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json new file mode 100644 index 0000000000..7ba9772da9 --- /dev/null +++ b/data/maps/MirageTower_3F/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MIRAGE_TOWER_3F", + "name": "MirageTower_3F", + "layout": "LAYOUT_MIRAGE_TOWER_3F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_3F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_3F_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + } + ], + "warp_events": [ + { + "x": 18, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MIRAGE_TOWER_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc deleted file mode 100644 index a2b22cad19..0000000000 --- a/data/maps/MirageTower_4F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11 - -MirageTower_4F_MapWarps: - warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F - -MirageTower_4F_MapEvents:: - map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc deleted file mode 100644 index b3bc8341a8..0000000000 --- a/data/maps/MirageTower_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_4F: - .4byte MirageTower_4F_Layout - .4byte MirageTower_4F_MapEvents - .4byte MirageTower_4F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_4F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json new file mode 100644 index 0000000000..a39ed14a95 --- /dev/null +++ b/data/maps/MirageTower_4F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_MIRAGE_TOWER_4F", + "name": "MirageTower_4F", + "layout": "LAYOUT_MIRAGE_TOWER_4F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 5, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_23AD48", + "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_23AD89", + "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_3F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc deleted file mode 100644 index c22091fe7c..0000000000 --- a/data/maps/MossdeepCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_MapConnectionsList: - connection up, 0, MAP_ROUTE125 - connection down, 0, MAP_ROUTE127 - connection left, -40, MAP_ROUTE124 - -MossdeepCity_MapConnections: - .4byte 3 - .4byte MossdeepCity_MapConnectionsList - diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc deleted file mode 100644 index a8284ae5dd..0000000000 --- a/data/maps/MossdeepCity/events.inc +++ /dev/null @@ -1,56 +0,0 @@ -MossdeepCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 - object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, FLAG_ITEM_MOSSDEEP_CITY_NET_BALL - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT - object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 - -MossdeepCity_MapWarps: - warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 - warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM - warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 67, 25, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2 - warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART - warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3 - warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE - warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4 - warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_MapCoordEvents: - coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 42, 21, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 22, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 23, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 24, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - -MossdeepCity_MapBGEvents: - bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26 - bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D - bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 - bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A - bg_event 66, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B2F - bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 - bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A - bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14 - -MossdeepCity_MapEvents:: - map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents - diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc deleted file mode 100644 index 5ac6ceeaa2..0000000000 --- a/data/maps/MossdeepCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity: - .4byte MossdeepCity_Layout - .4byte MossdeepCity_MapEvents - .4byte MossdeepCity_MapScripts - .4byte MossdeepCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json new file mode 100644 index 0000000000..66d4267807 --- /dev/null +++ b/data/maps/MossdeepCity/map.json @@ -0,0 +1,485 @@ +{ + "id": "MAP_MOSSDEEP_CITY", + "name": "MossdeepCity", + "layout": "LAYOUT_MOSSDEEP_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE125" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": -40, + "map": "MAP_ROUTE124" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 38, + "y": 12, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AD1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 50, + "y": 34, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AF9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 32, + "y": 12, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AB2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 26, + "y": 21, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AF0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 45, + "y": 18, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4B02", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 62, + "y": 35, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_2910F5", + "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 55, + "y": 5, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 56, + "y": 21, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4B0B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 23, + "y": 13, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C26", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 23, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 24, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 25, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 26, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 45, + "y": 25, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 19, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_2C81EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 61, + "y": 29, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C85", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 31, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C7C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 16, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 25, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 49, + "y": 6, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 10, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 16, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE4", + "dest_warp_id": 1 + }, + { + "x": 64, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 24, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 25, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 26, + "y": 25, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 32, + "y": 27, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 33, + "y": 27, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 42, + "y": 21, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 22, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 23, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 24, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 40, + "y": 25, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 40, + "y": 26, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 25, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B26" + }, + { + "type": "sign", + "x": 34, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B1D" + }, + { + "type": "sign", + "x": 29, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 38, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 66, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B2F" + }, + { + "type": "sign", + "x": 30, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 39, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 57, + "y": 21, + "elevation": 7, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B14" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc deleted file mode 100644 index e9b491f4d7..0000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MossdeepCity_GameCorner_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 - -MossdeepCity_GameCorner_1F_MapWarps: - warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY - warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY - warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F - -MossdeepCity_GameCorner_1F_MapBGEvents: - bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96 - -MossdeepCity_GameCorner_1F_MapEvents:: - map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents - diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc deleted file mode 100644 index 572a5fbe92..0000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_1F: - .4byte MossdeepCity_GameCorner_1F_Layout - .4byte MossdeepCity_GameCorner_1F_MapEvents - .4byte MossdeepCity_GameCorner_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json new file mode 100644 index 0000000000..ffb52896e2 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "name": "MossdeepCity_GameCorner_1F", + "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_GameCorner_1F_EventScript_224B54", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 9 + }, + { + "x": 2, + "y": 0, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 0, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_224B5D" + }, + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_277E9D" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_277E96" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc deleted file mode 100644 index d86974ae95..0000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_GameCorner_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -MossdeepCity_GameCorner_B1F_MapWarps: - warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_GameCorner_B1F_MapEvents:: - map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc deleted file mode 100644 index ee2f557319..0000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_B1F: - .4byte MossdeepCity_GameCorner_B1F_Layout - .4byte MossdeepCity_GameCorner_B1F_MapEvents - .4byte MossdeepCity_GameCorner_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json new file mode 100644 index 0000000000..4469b2642c --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", + "name": "MossdeepCity_GameCorner_B1F", + "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc deleted file mode 100644 index bc18f4eb77..0000000000 --- a/data/maps/MossdeepCity_Gym/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -MossdeepCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 - object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 - object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 - object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 - object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 - object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 - object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -MossdeepCity_Gym_MapWarps: - warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY - warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY - warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM - warp_def 1, 23, 3, 2, MAP_MOSSDEEP_CITY_GYM - warp_def 7, 18, 0, 5, MAP_MOSSDEEP_CITY_GYM - warp_def 8, 12, 0, 4, MAP_MOSSDEEP_CITY_GYM - warp_def 9, 18, 0, 7, MAP_MOSSDEEP_CITY_GYM - warp_def 23, 20, 0, 6, MAP_MOSSDEEP_CITY_GYM - warp_def 1, 33, 3, 9, MAP_MOSSDEEP_CITY_GYM - warp_def 20, 24, 0, 8, MAP_MOSSDEEP_CITY_GYM - warp_def 11, 3, 0, 11, MAP_MOSSDEEP_CITY_GYM - warp_def 11, 35, 3, 10, MAP_MOSSDEEP_CITY_GYM - warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM - warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM - -MossdeepCity_Gym_MapCoordEvents: - coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 - coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 15, 34, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C93 - coord_event 23, 24, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 23, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 8, 6, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CBF - coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1 - coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 - -MossdeepCity_Gym_MapBGEvents: - bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33 - bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43 - -MossdeepCity_Gym_MapEvents:: - map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents - diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc deleted file mode 100644 index e596d834be..0000000000 --- a/data/maps/MossdeepCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Gym: - .4byte MossdeepCity_Gym_Layout - .4byte MossdeepCity_Gym_MapEvents - .4byte MossdeepCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_MOSSDEEP_CITY_GYM - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json new file mode 100644 index 0000000000..37c41435b0 --- /dev/null +++ b/data/maps/MossdeepCity_Gym/map.json @@ -0,0 +1,687 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GYM", + "name": "MossdeepCity_Gym", + "layout": "LAYOUT_MOSSDEEP_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TATE", + "x": 23, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 1, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220AFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 5, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B2B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 23, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B59", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B14", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 6, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B42", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 5, + "y": 33, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220C11", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LIZA", + "x": 24, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 2, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 1, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 5, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 7, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B9E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 11, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 22, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BCC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 23, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 25, + "y": 25, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 22, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 21, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 21, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 22, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 25, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 24, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 24, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 23, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 28, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 23, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 12, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 7 + }, + { + "x": 23, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 33, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 20, + "y": 24, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 11, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 11 + }, + { + "x": 11, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 13, + "y": 32, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 13 + }, + { + "x": 21, + "y": 10, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 12 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 21, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C67" + }, + { + "type": "trigger", + "x": 8, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C7D" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C7D" + }, + { + "type": "trigger", + "x": 15, + "y": 34, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C93" + }, + { + "type": "trigger", + "x": 23, + "y": 24, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CA9" + }, + { + "type": "trigger", + "x": 23, + "y": 21, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CA9" + }, + { + "type": "trigger", + "x": 8, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CBF" + }, + { + "type": "trigger", + "x": 21, + "y": 6, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220AF1" + }, + { + "type": "trigger", + "x": 3, + "y": 30, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C67" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_Gym_EventScript_220C33" + }, + { + "type": "sign", + "x": 8, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_Gym_EventScript_220C43" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc deleted file mode 100644 index c16a852dfa..0000000000 --- a/data/maps/MossdeepCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MossdeepCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 - -MossdeepCity_House1_MapWarps: - warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY - -MossdeepCity_House1_MapEvents:: - map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc deleted file mode 100644 index c0a3de2c90..0000000000 --- a/data/maps/MossdeepCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House1: - .4byte House2_Layout - .4byte MossdeepCity_House1_MapEvents - .4byte MossdeepCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json new file mode 100644 index 0000000000..55e573f694 --- /dev/null +++ b/data/maps/MossdeepCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE1", + "name": "MossdeepCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House1_EventScript_221FD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House1_EventScript_222006", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc deleted file mode 100644 index 57d398ce90..0000000000 --- a/data/maps/MossdeepCity_House2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - -MossdeepCity_House2_MapWarps: - warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY - warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY - -MossdeepCity_House2_MapEvents:: - map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc deleted file mode 100644 index ffa15e3271..0000000000 --- a/data/maps/MossdeepCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House2: - .4byte House1_Layout - .4byte MossdeepCity_House2_MapEvents - .4byte MossdeepCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json new file mode 100644 index 0000000000..7f2121b7f1 --- /dev/null +++ b/data/maps/MossdeepCity_House2/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE2", + "name": "MossdeepCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220DF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220F1", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc deleted file mode 100644 index 7eb2c34161..0000000000 --- a/data/maps/MossdeepCity_House3/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MossdeepCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 - -MossdeepCity_House3_MapWarps: - warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY - -MossdeepCity_House3_MapEvents:: - map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc deleted file mode 100644 index b8caf392d1..0000000000 --- a/data/maps/MossdeepCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House3: - .4byte House2_Layout - .4byte MossdeepCity_House3_MapEvents - .4byte MossdeepCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json new file mode 100644 index 0000000000..1f28d4d222 --- /dev/null +++ b/data/maps/MossdeepCity_House3/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE3", + "name": "MossdeepCity_House3", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House3_EventScript_2225C3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc deleted file mode 100644 index 71dd54a5e4..0000000000 --- a/data/maps/MossdeepCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 - -MossdeepCity_House4_MapWarps: - warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY - warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY - -MossdeepCity_House4_MapEvents:: - map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc deleted file mode 100644 index 1e748b7b4b..0000000000 --- a/data/maps/MossdeepCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House4: - .4byte HouseWithBed_Layout - .4byte MossdeepCity_House4_MapEvents - .4byte MossdeepCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json new file mode 100644 index 0000000000..9f9f01ebd1 --- /dev/null +++ b/data/maps/MossdeepCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE4", + "name": "MossdeepCity_House4", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222DD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222DF7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222E1E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 7 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc deleted file mode 100644 index 770cb7ee5c..0000000000 --- a/data/maps/MossdeepCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MossdeepCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 - -MossdeepCity_Mart_MapWarps: - warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY - -MossdeepCity_Mart_MapEvents:: - map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc deleted file mode 100644 index 75ea708d1a..0000000000 --- a/data/maps/MossdeepCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Mart: - .4byte Mart_Layout - .4byte MossdeepCity_Mart_MapEvents - .4byte MossdeepCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json new file mode 100644 index 0000000000..6b739a2d2f --- /dev/null +++ b/data/maps/MossdeepCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_MOSSDEEP_CITY_MART", + "name": "MossdeepCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223C8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_222408", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 53aa694703..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MossdeepCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 - -MossdeepCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY - warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY - warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F - -MossdeepCity_PokemonCenter_1F_MapEvents:: - map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 719394a941..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte MossdeepCity_PokemonCenter_1F_MapEvents - .4byte MossdeepCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..6f1f3f774f --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "name": "MossdeepCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc deleted file mode 100644 index ce27a0804b..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 - -MossdeepCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -MossdeepCity_PokemonCenter_2F_MapEvents:: - map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 7bb1d541ca..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte MossdeepCity_PokemonCenter_2F_MapEvents - .4byte MossdeepCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..7aa2e7ccb3 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", + "name": "MossdeepCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc deleted file mode 100644 index 84466046f4..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -MossdeepCity_SpaceCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - -MossdeepCity_SpaceCenter_1F_MapWarps: - warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY - warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY - warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F - -MossdeepCity_SpaceCenter_1F_MapEvents:: - map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc deleted file mode 100644 index 5bce64c21b..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_1F: - .4byte MossdeepCity_SpaceCenter_1F_Layout - .4byte MossdeepCity_SpaceCenter_1F_MapEvents - .4byte MossdeepCity_SpaceCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json new file mode 100644 index 0000000000..f53950394f --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -0,0 +1,186 @@ +{ + "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "name": "MossdeepCity_SpaceCenter_1F", + "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 8 + }, + { + "x": 8, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 8 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc deleted file mode 100644 index 624185dfc2..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MossdeepCity_SpaceCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - -MossdeepCity_SpaceCenter_2F_MapWarps: - warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - -MossdeepCity_SpaceCenter_2F_MapEvents:: - map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc deleted file mode 100644 index 1d6b5834f6..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_2F: - .4byte MossdeepCity_SpaceCenter_2F_Layout - .4byte MossdeepCity_SpaceCenter_2F_MapEvents - .4byte MossdeepCity_SpaceCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json new file mode 100644 index 0000000000..a40f6ca9d7 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", + "name": "MossdeepCity_SpaceCenter_2F", + "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 0, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc deleted file mode 100644 index c9fa20d623..0000000000 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -MossdeepCity_StevensHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - -MossdeepCity_StevensHouse_MapWarps: - warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY - -MossdeepCity_StevensHouse_MapBGEvents: - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - -MossdeepCity_StevensHouse_MapEvents:: - map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents - diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc deleted file mode 100644 index a6e197f204..0000000000 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_StevensHouse: - .4byte MossdeepCity_StevensHouse_Layout - .4byte MossdeepCity_StevensHouse_MapEvents - .4byte MossdeepCity_StevensHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json new file mode 100644 index 0000000000..beedbd75ae --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", + "name": "MossdeepCity_StevensHouse", + "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_222912", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_222841", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_22291B", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc deleted file mode 100644 index e341872a70..0000000000 --- a/data/maps/MtChimney/events.inc +++ /dev/null @@ -1,45 +0,0 @@ -MtChimney_EventObjects: - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS - -MtChimney_MapWarps: - warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION - warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION - warp_def 20, 41, 3, 2, MAP_JAGGED_PASS - warp_def 21, 41, 3, 3, MAP_JAGGED_PASS - -MtChimney_MapBGEvents: - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4 - bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141 - -MtChimney_MapEvents:: - map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents - diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc deleted file mode 100644 index a7f03617e3..0000000000 --- a/data/maps/MtChimney/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney: - .4byte MtChimney_Layout - .4byte MtChimney_MapEvents - .4byte MtChimney_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MT_CHIMNEY - .byte MAPSEC_MT_CHIMNEY - .byte 0 - .byte WEATHER_ASH - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json new file mode 100644 index 0000000000..b8dd7bb09c --- /dev/null +++ b/data/maps/MtChimney/map.json @@ -0,0 +1,457 @@ +{ + "id": "MAP_MT_CHIMNEY", + "name": "MtChimney", + "layout": "LAYOUT_MT_CHIMNEY", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MT_CHIMNEY", + "requires_flash": false, + "weather": "WEATHER_ASH", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 24, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EDD5", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EE0B", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtChimney_EventScript_22F06E", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0C0", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 28, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0B7", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 19, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F05C", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 29, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F053", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 31, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F065", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 19, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EEF3", + "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 22, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0C9", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_RUN_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 23, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0A5", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 22, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 23, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0AE", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 21, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F09C", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 30, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 31, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F085", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 20, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 21, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F14A", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "MtChimney_EventScript_22F1AC", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 29, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1C3", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 27, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1DA", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 13, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1F1", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "MtChimney_EventScript_22F208", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + } + ], + "warp_events": [ + { + "x": 17, + "y": 36, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 36, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 41, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 2 + }, + { + "x": 21, + "y": 41, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MtChimney_EventScript_22F0E4" + }, + { + "type": "sign", + "x": 24, + "y": 37, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MtChimney_EventScript_22F141" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc deleted file mode 100644 index 24f64fbbb4..0000000000 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MtChimney_CableCarStation_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - -MtChimney_CableCarStation_MapWarps: - warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY - warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY - -MtChimney_CableCarStation_MapEvents:: - map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc deleted file mode 100644 index 7b3d628ccd..0000000000 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney_CableCarStation: - .4byte CableCarStation_Layout - .4byte MtChimney_CableCarStation_MapEvents - .4byte MtChimney_CableCarStation_MapScripts - .4byte 0x0 - .2byte MUS_DOORO_X1 - .2byte LAYOUT_CABLE_CAR_STATION - .byte MAPSEC_MT_CHIMNEY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json new file mode 100644 index 0000000000..155686bbb5 --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "name": "MtChimney_CableCarStation", + "layout": "LAYOUT_CABLE_CAR_STATION", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_MT_CHIMNEY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_CableCarStation_EventScript_22AC4B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 11, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 11, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc deleted file mode 100644 index 7b1d79e165..0000000000 --- a/data/maps/MtPyre_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -MtPyre_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 - -MtPyre_1F_MapWarps: - warp_def 17, 18, 3, 0, MAP_ROUTE122 - warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR - warp_def 18, 18, 3, 0, MAP_ROUTE122 - warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR - warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F - warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F - -MtPyre_1F_MapEvents:: - map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc deleted file mode 100644 index b4d6603df9..0000000000 --- a/data/maps/MtPyre_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_1F: - .4byte MtPyre_1F_Layout - .4byte MtPyre_1F_MapEvents - .4byte MtPyre_1F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_1F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json new file mode 100644 index 0000000000..1969ba9cdc --- /dev/null +++ b/data/maps/MtPyre_1F/map.json @@ -0,0 +1,103 @@ +{ + "id": "MAP_MT_PYRE_1F", + "name": "MtPyre_1F", + "layout": "LAYOUT_MT_PYRE_1F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 21, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F3F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 17, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F78", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F81", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 17, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROUTE122", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROUTE122", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc deleted file mode 100644 index f0ec0d0a34..0000000000 --- a/data/maps/MtPyre_2F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -MtPyre_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0 - object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 - object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 - -MtPyre_2F_MapWarps: - warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F - warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F - warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F - warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F - warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F - -MtPyre_2F_MapEvents:: - map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc deleted file mode 100644 index b1906b82e6..0000000000 --- a/data/maps/MtPyre_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_2F: - .4byte MtPyre_2F_Layout - .4byte MtPyre_2F_MapEvents - .4byte MtPyre_2F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_2F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json new file mode 100644 index 0000000000..07b20b3b38 --- /dev/null +++ b/data/maps/MtPyre_2F/map.json @@ -0,0 +1,161 @@ +{ + "id": "MAP_MT_PYRE_2F", + "name": "MtPyre_2F", + "layout": "LAYOUT_MT_PYRE_2F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_231128", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_2912FD", + "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_231116", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_23111F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtPyre_2F_EventScript_23115A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtPyre_2F_EventScript_23113F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_23118C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_231175", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 5 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc deleted file mode 100644 index 4d6f3c9eac..0000000000 --- a/data/maps/MtPyre_3F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MtPyre_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 - -MtPyre_3F_MapWarps: - warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F - warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F - warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F - warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F - warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F - warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F - -MtPyre_3F_MapEvents:: - map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc deleted file mode 100644 index 96026c7d9f..0000000000 --- a/data/maps/MtPyre_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_3F: - .4byte MtPyre_3F_Layout - .4byte MtPyre_3F_MapEvents - .4byte MtPyre_3F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_3F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json new file mode 100644 index 0000000000..a1b39048e4 --- /dev/null +++ b/data/maps/MtPyre_3F/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_MT_PYRE_3F", + "name": "MtPyre_3F", + "layout": "LAYOUT_MT_PYRE_3F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_231753", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_23176A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_3F_EventScript_29130A", + "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_231781", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 4 + }, + { + "x": 1, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 5 + }, + { + "x": 10, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc deleted file mode 100644 index 030039d18b..0000000000 --- a/data/maps/MtPyre_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE - -MtPyre_4F_MapWarps: - warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F - warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F - warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F - warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F - warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F - warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F - -MtPyre_4F_MapEvents:: - map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc deleted file mode 100644 index 86edc3843c..0000000000 --- a/data/maps/MtPyre_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F: - .4byte MtPyre_4F_Layout - .4byte MtPyre_4F_MapEvents - .4byte MtPyre_4F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_4F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json new file mode 100644 index 0000000000..a7bf954e71 --- /dev/null +++ b/data/maps/MtPyre_4F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_MT_PYRE_4F", + "name": "MtPyre_4F", + "layout": "LAYOUT_MT_PYRE_4F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_4F_EventScript_231C6E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_4F_EventScript_291317", + "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc deleted file mode 100644 index fd6261356f..0000000000 --- a/data/maps/MtPyre_5F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_5F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE - -MtPyre_5F_MapWarps: - warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F - warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F - warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F - warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F - warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F - -MtPyre_5F_MapEvents:: - map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc deleted file mode 100644 index 8296f03dcc..0000000000 --- a/data/maps/MtPyre_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_5F: - .4byte MtPyre_5F_Layout - .4byte MtPyre_5F_MapEvents - .4byte MtPyre_5F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_5F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json new file mode 100644 index 0000000000..b27d426ac5 --- /dev/null +++ b/data/maps/MtPyre_5F/map.json @@ -0,0 +1,83 @@ +{ + "id": "MAP_MT_PYRE_5F", + "name": "MtPyre_5F", + "layout": "LAYOUT_MT_PYRE_5F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_5F_EventScript_231BC9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_5F_EventScript_291324", + "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_6F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_6F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc deleted file mode 100644 index df862d84e6..0000000000 --- a/data/maps/MtPyre_6F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtPyre_6F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 - -MtPyre_6F_MapWarps: - warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F - warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F - -MtPyre_6F_MapEvents:: - map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc deleted file mode 100644 index ca0e545aa9..0000000000 --- a/data/maps/MtPyre_6F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_6F: - .4byte MtPyre_6F_Layout - .4byte MtPyre_6F_MapEvents - .4byte MtPyre_6F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_6F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json new file mode 100644 index 0000000000..a169953f23 --- /dev/null +++ b/data/maps/MtPyre_6F/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MT_PYRE_6F", + "name": "MtPyre_6F", + "layout": "LAYOUT_MT_PYRE_6F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_6F_EventScript_231D3B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_6F_EventScript_291331", + "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_6F_EventScript_231D9D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc deleted file mode 100644 index 1b8248e02c..0000000000 --- a/data/maps/MtPyre_Exterior/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -MtPyre_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 - -MtPyre_Exterior_MapWarps: - warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F - warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT - warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT - -MtPyre_Exterior_MapCoordEvents: - coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - -MtPyre_Exterior_MapBGEvents: - bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL - bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER - -MtPyre_Exterior_MapEvents:: - map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents - diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc deleted file mode 100644 index 9b9dfe1fad..0000000000 --- a/data/maps/MtPyre_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Exterior: - .4byte MtPyre_Exterior_Layout - .4byte MtPyre_Exterior_MapEvents - .4byte MtPyre_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_MACHUPI - .2byte LAYOUT_MT_PYRE_EXTERIOR - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json new file mode 100644 index 0000000000..2075fed62c --- /dev/null +++ b/data/maps/MtPyre_Exterior/map.json @@ -0,0 +1,132 @@ +{ + "id": "MAP_MT_PYRE_EXTERIOR", + "name": "MtPyre_Exterior", + "layout": "LAYOUT_MT_PYRE_EXTERIOR", + "music": "MUS_MACHUPI", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Exterior_EventScript_29133E", + "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Exterior_EventScript_29134B", + "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48" + } + ], + "warp_events": [ + { + "x": 10, + "y": 42, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_SUMMIT", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_SUMMIT", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 24, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + }, + { + "type": "trigger", + "x": 25, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + }, + { + "type": "trigger", + "x": 22, + "y": 27, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FF2" + }, + { + "type": "trigger", + "x": 23, + "y": 28, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FF2" + }, + { + "type": "trigger", + "x": 26, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 8, + "elevation": 0, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 16, + "y": 22, + "elevation": 0, + "item": "ITEM_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc deleted file mode 100644 index abe957f283..0000000000 --- a/data/maps/MtPyre_Summit/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -MtPyre_Summit_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE - -MtPyre_Summit_MapWarps: - warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - -MtPyre_Summit_MapCoordEvents: - coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 - coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 - coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 - coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC - coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 - coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 - -MtPyre_Summit_MapBGEvents: - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY - -MtPyre_Summit_MapEvents:: - map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents - diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc deleted file mode 100644 index 483afb9891..0000000000 --- a/data/maps/MtPyre_Summit/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Summit: - .4byte MtPyre_Summit_Layout - .4byte MtPyre_Summit_MapEvents - .4byte MtPyre_Summit_MapScripts - .4byte 0x0 - .2byte MUS_MACHUPI - .2byte LAYOUT_MT_PYRE_SUMMIT - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json new file mode 100644 index 0000000000..cc9efce093 --- /dev/null +++ b/data/maps/MtPyre_Summit/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_MT_PYRE_SUMMIT", + "name": "MtPyre_Summit", + "layout": "LAYOUT_MT_PYRE_SUMMIT", + "music": "MUS_MACHUPI", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_23213C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_2321A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_2323FD", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232414", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_23242B", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232442", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE" + } + ], + "warp_events": [ + { + "x": 22, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232018" + }, + { + "type": "trigger", + "x": 23, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232024" + }, + { + "type": "trigger", + "x": 24, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232030" + }, + { + "type": "trigger", + "x": 22, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321EC" + }, + { + "type": "trigger", + "x": 23, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321F8" + }, + { + "type": "trigger", + "x": 24, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_232204" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 25, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC" + }, + { + "type": "hidden_item", + "x": 37, + "y": 7, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc deleted file mode 100644 index 5142b09a20..0000000000 --- a/data/maps/NavelRock_B1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_B1F_MapWarps: - warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE - warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK - -NavelRock_B1F_MapEvents:: - map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc deleted file mode 100644 index 08842ade1d..0000000000 --- a/data/maps/NavelRock_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_B1F: - .4byte NavelRock_B1F_Layout - .4byte NavelRock_B1F_MapEvents - .4byte NavelRock_B1F_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_B1F - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json new file mode 100644 index 0000000000..6b5cd00893 --- /dev/null +++ b/data/maps/NavelRock_B1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F", + "layout": "LAYOUT_NAVEL_ROCK_B1F", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc deleted file mode 100644 index 16fa053ce9..0000000000 --- a/data/maps/NavelRock_Bottom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -NavelRock_Bottom_EventObjects: - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA - -NavelRock_Bottom_MapWarps: - warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 - -NavelRock_Bottom_MapEvents:: - map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc deleted file mode 100644 index b768e916aa..0000000000 --- a/data/maps/NavelRock_Bottom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Bottom: - .4byte NavelRock_Bottom_Layout - .4byte NavelRock_Bottom_MapEvents - .4byte NavelRock_Bottom_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_BOTTOM - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json new file mode 100644 index 0000000000..e4fb5a2fee --- /dev/null +++ b/data/maps/NavelRock_Bottom/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_NAVEL_ROCK_BOTTOM", + "name": "NavelRock_Bottom", + "layout": "LAYOUT_NAVEL_ROCK_BOTTOM", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LUGIA", + "x": 11, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Bottom_EventScript_2692A2", + "flag": "FLAG_HIDE_LUGIA" + } + ], + "warp_events": [ + { + "x": 14, + "y": 19, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_DOWN11", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc deleted file mode 100644 index 9874119a91..0000000000 --- a/data/maps/NavelRock_Down01/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down01_MapWarps: - warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 - -NavelRock_Down01_MapEvents:: - map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc deleted file mode 100644 index 7cddeeae7b..0000000000 --- a/data/maps/NavelRock_Down01/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down01: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down01_MapEvents - .4byte NavelRock_Down01_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json new file mode 100644 index 0000000000..50f60b52e5 --- /dev/null +++ b/data/maps/NavelRock_Down01/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN01", + "name": "NavelRock_Down01", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN02", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc deleted file mode 100644 index 449085ea5d..0000000000 --- a/data/maps/NavelRock_Down02/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down02_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 - -NavelRock_Down02_MapEvents:: - map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc deleted file mode 100644 index 03d45822b1..0000000000 --- a/data/maps/NavelRock_Down02/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down02: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down02_MapEvents - .4byte NavelRock_Down02_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json new file mode 100644 index 0000000000..fb2d151457 --- /dev/null +++ b/data/maps/NavelRock_Down02/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN02", + "name": "NavelRock_Down02", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN01", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN03", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc deleted file mode 100644 index 7b74ad4121..0000000000 --- a/data/maps/NavelRock_Down03/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down03_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 - -NavelRock_Down03_MapEvents:: - map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc deleted file mode 100644 index 694f840e4d..0000000000 --- a/data/maps/NavelRock_Down03/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down03: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down03_MapEvents - .4byte NavelRock_Down03_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json new file mode 100644 index 0000000000..a82e036101 --- /dev/null +++ b/data/maps/NavelRock_Down03/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN03", + "name": "NavelRock_Down03", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN02", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN04", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc deleted file mode 100644 index 5459b1d508..0000000000 --- a/data/maps/NavelRock_Down04/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down04_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 - -NavelRock_Down04_MapEvents:: - map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc deleted file mode 100644 index 0275b6422d..0000000000 --- a/data/maps/NavelRock_Down04/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down04: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down04_MapEvents - .4byte NavelRock_Down04_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json new file mode 100644 index 0000000000..58e81b709e --- /dev/null +++ b/data/maps/NavelRock_Down04/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN04", + "name": "NavelRock_Down04", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN03", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN05", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc deleted file mode 100644 index de52fa07f5..0000000000 --- a/data/maps/NavelRock_Down05/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down05_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 - -NavelRock_Down05_MapEvents:: - map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc deleted file mode 100644 index 50e298b6e0..0000000000 --- a/data/maps/NavelRock_Down05/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down05: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down05_MapEvents - .4byte NavelRock_Down05_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json new file mode 100644 index 0000000000..a1fcef804b --- /dev/null +++ b/data/maps/NavelRock_Down05/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN05", + "name": "NavelRock_Down05", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN04", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN06", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc deleted file mode 100644 index 54e5f229eb..0000000000 --- a/data/maps/NavelRock_Down06/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down06_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 - -NavelRock_Down06_MapEvents:: - map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc deleted file mode 100644 index 8e18db5b92..0000000000 --- a/data/maps/NavelRock_Down06/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down06: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down06_MapEvents - .4byte NavelRock_Down06_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json new file mode 100644 index 0000000000..204a2a2cfe --- /dev/null +++ b/data/maps/NavelRock_Down06/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN06", + "name": "NavelRock_Down06", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN05", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN07", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc deleted file mode 100644 index 55b4dd10c4..0000000000 --- a/data/maps/NavelRock_Down07/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down07_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 - -NavelRock_Down07_MapEvents:: - map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc deleted file mode 100644 index 75c41046e7..0000000000 --- a/data/maps/NavelRock_Down07/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down07: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down07_MapEvents - .4byte NavelRock_Down07_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json new file mode 100644 index 0000000000..f48063d8a0 --- /dev/null +++ b/data/maps/NavelRock_Down07/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN07", + "name": "NavelRock_Down07", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN06", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN08", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc deleted file mode 100644 index b1180ed83a..0000000000 --- a/data/maps/NavelRock_Down08/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down08_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 - -NavelRock_Down08_MapEvents:: - map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc deleted file mode 100644 index bcb69b4128..0000000000 --- a/data/maps/NavelRock_Down08/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down08: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down08_MapEvents - .4byte NavelRock_Down08_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json new file mode 100644 index 0000000000..d5f7ea8fea --- /dev/null +++ b/data/maps/NavelRock_Down08/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN08", + "name": "NavelRock_Down08", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN07", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN09", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc deleted file mode 100644 index e7279c4d08..0000000000 --- a/data/maps/NavelRock_Down09/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down09_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 - -NavelRock_Down09_MapEvents:: - map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc deleted file mode 100644 index cb80dd7fae..0000000000 --- a/data/maps/NavelRock_Down09/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down09: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down09_MapEvents - .4byte NavelRock_Down09_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json new file mode 100644 index 0000000000..348739b31b --- /dev/null +++ b/data/maps/NavelRock_Down09/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN09", + "name": "NavelRock_Down09", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN08", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN10", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc deleted file mode 100644 index b9eadabf1e..0000000000 --- a/data/maps/NavelRock_Down10/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down10_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 - -NavelRock_Down10_MapEvents:: - map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc deleted file mode 100644 index 308a89e05c..0000000000 --- a/data/maps/NavelRock_Down10/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down10: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down10_MapEvents - .4byte NavelRock_Down10_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json new file mode 100644 index 0000000000..3aa128fa0b --- /dev/null +++ b/data/maps/NavelRock_Down10/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN10", + "name": "NavelRock_Down10", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN09", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN11", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc deleted file mode 100644 index 9822ee8ff1..0000000000 --- a/data/maps/NavelRock_Down11/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down11_MapWarps: - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 - -NavelRock_Down11_MapEvents:: - map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc deleted file mode 100644 index 2c5a0862b9..0000000000 --- a/data/maps/NavelRock_Down11/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down11: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down11_MapEvents - .4byte NavelRock_Down11_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json new file mode 100644 index 0000000000..0ed44f0fcd --- /dev/null +++ b/data/maps/NavelRock_Down11/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN11", + "name": "NavelRock_Down11", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BOTTOM", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN10", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc deleted file mode 100644 index b063f08d8a..0000000000 --- a/data/maps/NavelRock_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Entrance_MapWarps: - warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F - warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR - -NavelRock_Entrance_MapEvents:: - map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc deleted file mode 100644 index 793ab85cdf..0000000000 --- a/data/maps/NavelRock_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Entrance: - .4byte NavelRock_Entrance_Layout - .4byte NavelRock_Entrance_MapEvents - .4byte NavelRock_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_ENTRANCE - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json new file mode 100644 index 0000000000..983df45df5 --- /dev/null +++ b/data/maps/NavelRock_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_ENTRANCE", + "name": "NavelRock_Entrance", + "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 26, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc deleted file mode 100644 index 1ec151c8c2..0000000000 --- a/data/maps/NavelRock_Exterior/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Exterior_MapWarps: - warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR - warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE - -NavelRock_Exterior_MapEvents:: - map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc deleted file mode 100644 index f355dbf559..0000000000 --- a/data/maps/NavelRock_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Exterior: - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_Exterior_MapEvents - .4byte NavelRock_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANASHIMA - .2byte LAYOUT_NAVEL_ROCK_EXTERIOR - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json new file mode 100644 index 0000000000..b98f08d4e4 --- /dev/null +++ b/data/maps/NavelRock_Exterior/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior", + "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "music": "MUS_RG_NANASHIMA", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 10, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc deleted file mode 100644 index fde5e5930e..0000000000 --- a/data/maps/NavelRock_Fork/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Fork_MapWarps: - warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 - warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F - warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 - -NavelRock_Fork_MapEvents:: - map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc deleted file mode 100644 index 01e4f7bccd..0000000000 --- a/data/maps/NavelRock_Fork/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Fork: - .4byte NavelRock_Fork_Layout - .4byte NavelRock_Fork_MapEvents - .4byte NavelRock_Fork_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_FORK - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json new file mode 100644 index 0000000000..728b8a7aa4 --- /dev/null +++ b/data/maps/NavelRock_Fork/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork", + "layout": "LAYOUT_NAVEL_ROCK_FORK", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP1", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 79, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 6, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc deleted file mode 100644 index 0c687f1fc0..0000000000 --- a/data/maps/NavelRock_Harbor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -NavelRock_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -NavelRock_Harbor_MapWarps: - warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR - -NavelRock_Harbor_MapEvents:: - map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc deleted file mode 100644 index 2af7e6e35e..0000000000 --- a/data/maps/NavelRock_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Harbor: - .4byte IslandHarbor_Layout - .4byte NavelRock_Harbor_MapEvents - .4byte NavelRock_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANASHIMA - .2byte LAYOUT_ISLAND_HARBOR - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json new file mode 100644 index 0000000000..39c8d9f0f6 --- /dev/null +++ b/data/maps/NavelRock_Harbor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_NAVEL_ROCK_HARBOR", + "name": "NavelRock_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "MUS_RG_NANASHIMA", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Harbor_EventScript_2690BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc deleted file mode 100644 index 7ba534d027..0000000000 --- a/data/maps/NavelRock_Top/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top_EventObjects: - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH - -NavelRock_Top_MapWarps: - warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 - -NavelRock_Top_MapCoordEvents: - coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F - -NavelRock_Top_MapBGEvents: - bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH - -NavelRock_Top_MapEvents:: - map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents - diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc deleted file mode 100644 index 6e8acfce85..0000000000 --- a/data/maps/NavelRock_Top/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top: - .4byte NavelRock_Top_Layout - .4byte NavelRock_Top_MapEvents - .4byte NavelRock_Top_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_TOP - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json new file mode 100644 index 0000000000..cc2070e7e3 --- /dev/null +++ b/data/maps/NavelRock_Top/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_NAVEL_ROCK_TOP", + "name": "NavelRock_Top", + "layout": "LAYOUT_NAVEL_ROCK_TOP", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HOOH", + "x": 12, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_HO_OH" + } + ], + "warp_events": [ + { + "x": 13, + "y": 20, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP4", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NavelRock_Top_EventScript_26916F" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 9, + "elevation": 3, + "item": "ITEM_SACRED_ASH", + "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH" + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc deleted file mode 100644 index c0dba5dd3a..0000000000 --- a/data/maps/NavelRock_Up1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up1_MapWarps: - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 - -NavelRock_Up1_MapEvents:: - map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc deleted file mode 100644 index 2ddaf1dcc6..0000000000 --- a/data/maps/NavelRock_Up1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up1: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Up1_MapEvents - .4byte NavelRock_Up1_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json new file mode 100644 index 0000000000..24d1b5a323 --- /dev/null +++ b/data/maps/NavelRock_Up1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP1", + "name": "NavelRock_Up1", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc deleted file mode 100644 index 8d6f64dbc2..0000000000 --- a/data/maps/NavelRock_Up2/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up2_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 - -NavelRock_Up2_MapEvents:: - map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc deleted file mode 100644 index 68fe366f2c..0000000000 --- a/data/maps/NavelRock_Up2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up2: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Up2_MapEvents - .4byte NavelRock_Up2_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json new file mode 100644 index 0000000000..2d16e798c6 --- /dev/null +++ b/data/maps/NavelRock_Up2/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP2", + "name": "NavelRock_Up2", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP1", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc deleted file mode 100644 index 3853f75c7e..0000000000 --- a/data/maps/NavelRock_Up3/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up3_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 - -NavelRock_Up3_MapEvents:: - map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc deleted file mode 100644 index b357349b7c..0000000000 --- a/data/maps/NavelRock_Up3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up3: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Up3_MapEvents - .4byte NavelRock_Up3_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json new file mode 100644 index 0000000000..2e984b3792 --- /dev/null +++ b/data/maps/NavelRock_Up3/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP3", + "name": "NavelRock_Up3", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP2", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc deleted file mode 100644 index 449e1f29da..0000000000 --- a/data/maps/NavelRock_Up4/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up4_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP - -NavelRock_Up4_MapEvents:: - map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc deleted file mode 100644 index 4c44746f06..0000000000 --- a/data/maps/NavelRock_Up4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up4: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Up4_MapEvents - .4byte NavelRock_Up4_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json new file mode 100644 index 0000000000..e448e6a9a0 --- /dev/null +++ b/data/maps/NavelRock_Up4/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP4", + "name": "NavelRock_Up4", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP3", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_TOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc deleted file mode 100644 index d230fc4e99..0000000000 --- a/data/maps/NewMauville_Entrance/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -NewMauville_Entrance_MapWarps: - warp_def 4, 6, 3, 0, MAP_ROUTE110 - warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE - -NewMauville_Entrance_MapCoordEvents: - coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF - -NewMauville_Entrance_MapEvents:: - map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 - diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc deleted file mode 100644 index c0b8938ca4..0000000000 --- a/data/maps/NewMauville_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Entrance: - .4byte NewMauville_Entrance_Layout - .4byte NewMauville_Entrance_MapEvents - .4byte NewMauville_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_NEW_MAUVILLE_ENTRANCE - .byte MAPSEC_NEW_MAUVILLE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json new file mode 100644 index 0000000000..bfc15c8a06 --- /dev/null +++ b/data/maps/NewMauville_Entrance/map.json @@ -0,0 +1,45 @@ +{ + "id": "MAP_NEW_MAUVILLE_ENTRANCE", + "name": "NewMauville_Entrance", + "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_NEW_MAUVILLE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_INSIDE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 2, + "elevation": 3, + "var": "VAR_0x40BA", + "var_value": 0, + "script": "NewMauville_Entrance_EventScript_2372FF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc deleted file mode 100644 index c366496f4d..0000000000 --- a/data/maps/NewMauville_Inside/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -NewMauville_Inside_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 - -NewMauville_Inside_MapWarps: - warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE - -NewMauville_Inside_MapCoordEvents: - coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725 - -NewMauville_Inside_MapBGEvents: - bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - -NewMauville_Inside_MapEvents:: - map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents - diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc deleted file mode 100644 index c4e7368859..0000000000 --- a/data/maps/NewMauville_Inside/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Inside: - .4byte NewMauville_Inside_Layout - .4byte NewMauville_Inside_MapEvents - .4byte NewMauville_Inside_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_NEW_MAUVILLE_INSIDE - .byte MAPSEC_NEW_MAUVILLE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json new file mode 100644 index 0000000000..223faec2d9 --- /dev/null +++ b/data/maps/NewMauville_Inside/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_NEW_MAUVILLE_INSIDE", + "name": "NewMauville_Inside", + "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_NEW_MAUVILLE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2911EC", + "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2911F9", + "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 39, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291206", + "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 17, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291213", + "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291220", + "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2377AF", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2377FC", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_237849", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3" + } + ], + "warp_events": [ + { + "x": 32, + "y": 33, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 30, + "y": 38, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 18, + "y": 36, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 4, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 16, + "y": 22, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 25, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 2, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 6, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 17, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 33, + "y": 6, + "elevation": 3, + "var": "VAR_0x40BA", + "var_value": 1, + "script": "NewMauville_Inside_EventScript_237725" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 32, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 32, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 33, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 34, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + } + ] +} \ No newline at end of file diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc deleted file mode 100644 index a82523c9c0..0000000000 --- a/data/maps/OldaleTown/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -OldaleTown_MapConnectionsList: - connection up, 0, MAP_ROUTE103 - connection down, 0, MAP_ROUTE101 - connection left, 0, MAP_ROUTE102 - -OldaleTown_MapConnections: - .4byte 3 - .4byte OldaleTown_MapConnectionsList - diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc deleted file mode 100644 index aa56e67f64..0000000000 --- a/data/maps/OldaleTown/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -OldaleTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL - -OldaleTown_MapWarps: - warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 - warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 - warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART - -OldaleTown_MapCoordEvents: - coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F - coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086 - coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6 - coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6 - -OldaleTown_MapBGEvents: - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA - bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 - bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A - bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A - -OldaleTown_MapEvents:: - map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents - diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc deleted file mode 100644 index 30025e1f1d..0000000000 --- a/data/maps/OldaleTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown: - .4byte OldaleTown_Layout - .4byte OldaleTown_MapEvents - .4byte OldaleTown_MapScripts - .4byte OldaleTown_MapConnections - .2byte MUS_MACHI_S4 - .2byte LAYOUT_OLDALE_TOWN - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json new file mode 100644 index 0000000000..378d108e27 --- /dev/null +++ b/data/maps/OldaleTown/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_OLDALE_TOWN", + "name": "OldaleTown", + "layout": "LAYOUT_OLDALE_TOWN", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE103" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE101" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE102" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 16, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E8EF3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E8EFC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E901F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E9070", + "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 16, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 6, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 0, + "y": 10, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 0, + "script": "OldaleTown_EventScript_1E903F" + }, + { + "type": "trigger", + "x": 8, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E9086" + }, + { + "type": "trigger", + "x": 9, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E90A6" + }, + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E90C6" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "OldaleTown_EventScript_1E8EEA" + }, + { + "type": "sign", + "x": 7, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 15, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 8, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc deleted file mode 100644 index 8fc37079c7..0000000000 --- a/data/maps/OldaleTown_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -OldaleTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 - -OldaleTown_House1_MapWarps: - warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN - warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN - -OldaleTown_House1_MapEvents:: - map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc deleted file mode 100644 index 7dc2d6b70a..0000000000 --- a/data/maps/OldaleTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_House1: - .4byte House1_Layout - .4byte OldaleTown_House1_MapEvents - .4byte OldaleTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json new file mode 100644 index 0000000000..fe0ac7b6aa --- /dev/null +++ b/data/maps/OldaleTown_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_OLDALE_TOWN_HOUSE1", + "name": "OldaleTown_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House1_EventScript_1FBE86", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc deleted file mode 100644 index 45678ebb88..0000000000 --- a/data/maps/OldaleTown_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -OldaleTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 - -OldaleTown_House2_MapWarps: - warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN - -OldaleTown_House2_MapEvents:: - map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc deleted file mode 100644 index 4ae5e078ce..0000000000 --- a/data/maps/OldaleTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_House2: - .4byte House2_Layout - .4byte OldaleTown_House2_MapEvents - .4byte OldaleTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json new file mode 100644 index 0000000000..2de7632fd3 --- /dev/null +++ b/data/maps/OldaleTown_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_OLDALE_TOWN_HOUSE2", + "name": "OldaleTown_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House2_EventScript_1FBF5B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House2_EventScript_1FBF64", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc deleted file mode 100644 index 2d29aedba7..0000000000 --- a/data/maps/OldaleTown_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -OldaleTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 - -OldaleTown_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN - -OldaleTown_Mart_MapEvents:: - map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc deleted file mode 100644 index a371273bd8..0000000000 --- a/data/maps/OldaleTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_Mart: - .4byte Mart_Layout - .4byte OldaleTown_Mart_MapEvents - .4byte OldaleTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json new file mode 100644 index 0000000000..1226dd17fa --- /dev/null +++ b/data/maps/OldaleTown_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_OLDALE_TOWN_MART", + "name": "OldaleTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC240", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC28A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC2A9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc deleted file mode 100644 index f05c854b4c..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 - -OldaleTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN - warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN - warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F - -OldaleTown_PokemonCenter_1F_MapEvents:: - map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 394ca49695..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte OldaleTown_PokemonCenter_1F_MapEvents - .4byte OldaleTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..94cbe1627d --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "name": "OldaleTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 2f155ed57c..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -OldaleTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -OldaleTown_PokemonCenter_2F_MapEvents:: - map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 33437b8637..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte OldaleTown_PokemonCenter_2F_MapEvents - .4byte OldaleTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..7a899e4a91 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", + "name": "OldaleTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc deleted file mode 100644 index bea3619dd0..0000000000 --- a/data/maps/PacifidlogTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -PacifidlogTown_MapConnectionsList: - connection left, 0, MAP_ROUTE132 - connection right, 0, MAP_ROUTE131 - -PacifidlogTown_MapConnections: - .4byte 2 - .4byte PacifidlogTown_MapConnectionsList - diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc deleted file mode 100644 index 2754afc4d5..0000000000 --- a/data/maps/PacifidlogTown/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -PacifidlogTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 - -PacifidlogTown_MapWarps: - warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 - warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 - warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3 - warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 - warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 - -PacifidlogTown_MapBGEvents: - bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 - bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 - -PacifidlogTown_MapEvents:: - map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents - diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc deleted file mode 100644 index 0232c06134..0000000000 --- a/data/maps/PacifidlogTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown: - .4byte PacifidlogTown_Layout - .4byte PacifidlogTown_MapEvents - .4byte PacifidlogTown_MapScripts - .4byte PacifidlogTown_MapConnections - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json new file mode 100644 index 0000000000..1219eabadf --- /dev/null +++ b/data/maps/PacifidlogTown/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN", + "name": "PacifidlogTown", + "layout": "LAYOUT_PACIFIDLOG_TOWN", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE132" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE131" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 10, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBACC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 11, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBAD5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBAC3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 15, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 22, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 24, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 12, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 21, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE5", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PacifidlogTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 7, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PacifidlogTown_EventScript_1EBADE" + }, + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PacifidlogTown_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc deleted file mode 100644 index 3b5b06af7b..0000000000 --- a/data/maps/PacifidlogTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 - -PacifidlogTown_House1_MapWarps: - warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House1_MapEvents:: - map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc deleted file mode 100644 index 53a3499ce9..0000000000 --- a/data/maps/PacifidlogTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House1: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House1_MapEvents - .4byte PacifidlogTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json new file mode 100644 index 0000000000..19f592374e --- /dev/null +++ b/data/maps/PacifidlogTown_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", + "name": "PacifidlogTown_House1", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House1_EventScript_20365D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House1_EventScript_203666", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc deleted file mode 100644 index 5a521ab4b9..0000000000 --- a/data/maps/PacifidlogTown_House2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PacifidlogTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 - -PacifidlogTown_House2_MapWarps: - warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House2_MapEvents:: - map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc deleted file mode 100644 index f41349ba5b..0000000000 --- a/data/maps/PacifidlogTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House2: - .4byte PacifidlogTown_House2_Layout - .4byte PacifidlogTown_House2_MapEvents - .4byte PacifidlogTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json new file mode 100644 index 0000000000..370b37d736 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", + "name": "PacifidlogTown_House2", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_203792", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_203891", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_2038AC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc deleted file mode 100644 index 7f18a831e5..0000000000 --- a/data/maps/PacifidlogTown_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 - -PacifidlogTown_House3_MapWarps: - warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House3_MapEvents:: - map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc deleted file mode 100644 index 9f6286b13a..0000000000 --- a/data/maps/PacifidlogTown_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House3: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House3_MapEvents - .4byte PacifidlogTown_House3_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json new file mode 100644 index 0000000000..5788245257 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", + "name": "PacifidlogTown_House3", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House3_EventScript_203CB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House3_EventScript_203C11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc deleted file mode 100644 index ed736434f4..0000000000 --- a/data/maps/PacifidlogTown_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PacifidlogTown_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 - -PacifidlogTown_House4_MapWarps: - warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House4_MapEvents:: - map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc deleted file mode 100644 index ff9240d0d6..0000000000 --- a/data/maps/PacifidlogTown_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House4: - .4byte PacifidlogTown_House2_Layout - .4byte PacifidlogTown_House4_MapEvents - .4byte PacifidlogTown_House4_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json new file mode 100644 index 0000000000..2db52fe9b2 --- /dev/null +++ b/data/maps/PacifidlogTown_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", + "name": "PacifidlogTown_House4", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F55", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F4C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F5E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc deleted file mode 100644 index d3e00938a8..0000000000 --- a/data/maps/PacifidlogTown_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 - -PacifidlogTown_House5_MapWarps: - warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House5_MapEvents:: - map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc deleted file mode 100644 index a70ac39920..0000000000 --- a/data/maps/PacifidlogTown_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House5: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House5_MapEvents - .4byte PacifidlogTown_House5_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json new file mode 100644 index 0000000000..b8c4a03523 --- /dev/null +++ b/data/maps/PacifidlogTown_House5/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", + "name": "PacifidlogTown_House5", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House5_EventScript_204111", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House5_EventScript_204137", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc deleted file mode 100644 index edc6e916f7..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 - -PacifidlogTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN - warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN - warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F - -PacifidlogTown_PokemonCenter_1F_MapEvents:: - map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 39135ef6ac..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte PacifidlogTown_PokemonCenter_1F_MapEvents - .4byte PacifidlogTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..1f141dec57 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "name": "PacifidlogTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 1d0e1a449c..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -PacifidlogTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -PacifidlogTown_PokemonCenter_2F_MapEvents:: - map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc deleted file mode 100644 index a6c1609d32..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte PacifidlogTown_PokemonCenter_2F_MapEvents - .4byte PacifidlogTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..2b6a43ce0f --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", + "name": "PacifidlogTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc deleted file mode 100644 index 0c576c79f4..0000000000 --- a/data/maps/PetalburgCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -PetalburgCity_MapConnectionsList: - connection left, -50, MAP_ROUTE104 - connection right, 10, MAP_ROUTE102 - -PetalburgCity_MapConnections: - .4byte 2 - .4byte PetalburgCity_MapConnectionsList - diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc deleted file mode 100644 index 83b3d227eb..0000000000 --- a/data/maps/PetalburgCity/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -PetalburgCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 - object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, FLAG_ITEM_PETALBURG_CITY_ETHER - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT - -PetalburgCity_MapWarps: - warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 - warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE - warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM - warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 - warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART - -PetalburgCity_MapCoordEvents: - coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A - coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6 - coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2 - coord_event 8, 13, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4BE - coord_event 4, 10, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC691 - coord_event 4, 11, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6A7 - coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD - coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3 - -PetalburgCity_MapBGEvents: - bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476 - bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A - bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 - bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC47F - bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 - bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 - bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY - -PetalburgCity_MapEvents:: - map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents - diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc deleted file mode 100644 index 4aafc87a60..0000000000 --- a/data/maps/PetalburgCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity: - .4byte PetalburgCity_Layout - .4byte PetalburgCity_MapEvents - .4byte PetalburgCity_MapScripts - .4byte PetalburgCity_MapConnections - .2byte MUS_MACHI_S2 - .2byte LAYOUT_PETALBURG_CITY - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json new file mode 100644 index 0000000000..e62590b814 --- /dev/null +++ b/data/maps/PetalburgCity/map.json @@ -0,0 +1,330 @@ +{ + "id": "MAP_PETALBURG_CITY", + "name": "PetalburgCity", + "layout": "LAYOUT_PETALBURG_CITY", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": -50, + "map": "MAP_ROUTE104" + }, + { + "direction": "right", + "offset": 10, + "map": "MAP_ROUTE102" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC3FD", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 8, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC3E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC488", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_2910B4", + "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_2910C1", + "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 12, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC82E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_WALLYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 16, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 24, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 12, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 10, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC49A" + }, + { + "type": "trigger", + "x": 8, + "y": 11, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4A6" + }, + { + "type": "trigger", + "x": 8, + "y": 12, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4B2" + }, + { + "type": "trigger", + "x": 8, + "y": 13, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4BE" + }, + { + "type": "trigger", + "x": 4, + "y": 10, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC691" + }, + { + "type": "trigger", + "x": 4, + "y": 11, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6A7" + }, + { + "type": "trigger", + "x": 4, + "y": 12, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6BD" + }, + { + "type": "trigger", + "x": 4, + "y": 13, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6D3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 17, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC476" + }, + { + "type": "sign", + "x": 26, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 21, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 17, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC47F" + }, + { + "type": "sign", + "x": 22, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 27, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC491" + }, + { + "type": "hidden_item", + "x": 11, + "y": 29, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc deleted file mode 100644 index 81b244f2ec..0000000000 --- a/data/maps/PetalburgCity_Gym/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -PetalburgCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 - object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, FLAG_HIDE_PETALBURG_GYM_GREETER - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE - -PetalburgCity_Gym_MapWarps: - warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY - warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY - warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM - warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM - warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM - warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM - warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM - warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM - warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM - warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM - warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM - warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM - warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM - warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM - warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM - warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM - warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM - warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM - warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM - warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM - warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM - warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM - warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM - warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM - warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM - warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM - warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM - warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM - warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM - warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM - warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM - warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM - warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM - warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM - warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM - warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM - warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM - warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM - -PetalburgCity_Gym_MapBGEvents: - bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137 - bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187 - bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC - bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051EF - bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205222 - bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205255 - bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205288 - bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052BB - bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052EE - bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205321 - bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205354 - bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205387 - bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E - bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E - -PetalburgCity_Gym_MapEvents:: - map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents - diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc deleted file mode 100644 index d58d30b909..0000000000 --- a/data/maps/PetalburgCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Gym: - .4byte PetalburgCity_Gym_Layout - .4byte PetalburgCity_Gym_MapEvents - .4byte PetalburgCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_PETALBURG_CITY_GYM - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json new file mode 100644 index 0000000000..6f133a979a --- /dev/null +++ b/data/maps/PetalburgCity_Gym/map.json @@ -0,0 +1,544 @@ +{ + "id": "MAP_PETALBURG_CITY_GYM", + "name": "PetalburgCity_Gym", + "layout": "LAYOUT_PETALBURG_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2049F1", + "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 94, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2054AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 81, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2053BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2053F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2054E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_205432", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_205522", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_20546E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 109, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_20574F", + "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 4, + "y": 111, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE" + } + ], + "warp_events": [ + { + "x": 4, + "y": 111, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 111, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 105, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 85, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 85, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 105, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 98, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 98, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 79, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 7, + "y": 79, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 12 + }, + { + "x": 7, + "y": 46, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 46, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 1, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 2, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 92, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 16 + }, + { + "x": 7, + "y": 92, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 18 + }, + { + "x": 7, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 6, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 1, + "y": 72, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 2, + "y": 72, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 7, + "y": 40, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 24 + }, + { + "x": 1, + "y": 53, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 26 + }, + { + "x": 7, + "y": 53, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 28 + }, + { + "x": 1, + "y": 66, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 30 + }, + { + "x": 1, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 2, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 7, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 6, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 1, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 2, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 7, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 6, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 34 + }, + { + "x": 1, + "y": 27, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 36 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 2, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 7, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 33 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 33 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 105, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205137" + }, + { + "type": "sign", + "x": 7, + "y": 105, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205187" + }, + { + "type": "sign", + "x": 1, + "y": 79, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2051BC" + }, + { + "type": "sign", + "x": 7, + "y": 79, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2051EF" + }, + { + "type": "sign", + "x": 1, + "y": 92, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205222" + }, + { + "type": "sign", + "x": 7, + "y": 92, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205255" + }, + { + "type": "sign", + "x": 7, + "y": 40, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205288" + }, + { + "type": "sign", + "x": 1, + "y": 53, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2052BB" + }, + { + "type": "sign", + "x": 7, + "y": 53, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2052EE" + }, + { + "type": "sign", + "x": 1, + "y": 66, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205321" + }, + { + "type": "sign", + "x": 7, + "y": 14, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205354" + }, + { + "type": "sign", + "x": 1, + "y": 27, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205387" + }, + { + "type": "sign", + "x": 1, + "y": 110, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_Gym_EventScript_20576E" + }, + { + "type": "sign", + "x": 7, + "y": 110, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_Gym_EventScript_20577E" + } + ] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc deleted file mode 100644 index 9a22e581d6..0000000000 --- a/data/maps/PetalburgCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 - -PetalburgCity_House1_MapWarps: - warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY - warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY - -PetalburgCity_House1_MapEvents:: - map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc deleted file mode 100644 index 7582e63369..0000000000 --- a/data/maps/PetalburgCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_House1: - .4byte House1_Layout - .4byte PetalburgCity_House1_MapEvents - .4byte PetalburgCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json new file mode 100644 index 0000000000..1345f8d6be --- /dev/null +++ b/data/maps/PetalburgCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_HOUSE1", + "name": "PetalburgCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House1_EventScript_2077A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House1_EventScript_20779A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc deleted file mode 100644 index cc964b56c9..0000000000 --- a/data/maps/PetalburgCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 - -PetalburgCity_House2_MapWarps: - warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY - -PetalburgCity_House2_MapEvents:: - map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc deleted file mode 100644 index 36eb663c0e..0000000000 --- a/data/maps/PetalburgCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_House2: - .4byte HouseWithBed_Layout - .4byte PetalburgCity_House2_MapEvents - .4byte PetalburgCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json new file mode 100644 index 0000000000..cc193445ee --- /dev/null +++ b/data/maps/PetalburgCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_HOUSE2", + "name": "PetalburgCity_House2", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House2_EventScript_2078F3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House2_EventScript_2078FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc deleted file mode 100644 index 9cb05df7d7..0000000000 --- a/data/maps/PetalburgCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -PetalburgCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 - -PetalburgCity_Mart_MapWarps: - warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY - -PetalburgCity_Mart_MapEvents:: - map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc deleted file mode 100644 index e95fb35537..0000000000 --- a/data/maps/PetalburgCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Mart: - .4byte Mart_Layout - .4byte PetalburgCity_Mart_MapEvents - .4byte PetalburgCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json new file mode 100644 index 0000000000..c811ece3c0 --- /dev/null +++ b/data/maps/PetalburgCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_PETALBURG_CITY_MART", + "name": "PetalburgCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207D69", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DE8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DDF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DD6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc deleted file mode 100644 index de02c8a8ee..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 - -PetalburgCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY - warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY - warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F - -PetalburgCity_PokemonCenter_1F_MapEvents:: - map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 08ec4783fb..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte PetalburgCity_PokemonCenter_1F_MapEvents - .4byte PetalburgCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..a82cbb85aa --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "name": "PetalburgCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_291539", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 49514363b3..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -PetalburgCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -PetalburgCity_PokemonCenter_2F_MapEvents:: - map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 779a106b91..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte PetalburgCity_PokemonCenter_2F_MapEvents - .4byte PetalburgCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..49f2942b35 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", + "name": "PetalburgCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc deleted file mode 100644 index 98487bd2ce..0000000000 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_WallysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 - -PetalburgCity_WallysHouse_MapWarps: - warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY - -PetalburgCity_WallysHouse_MapEvents:: - map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc deleted file mode 100644 index 2c49b77f64..0000000000 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_WallysHouse: - .4byte House2_Layout - .4byte PetalburgCity_WallysHouse_MapEvents - .4byte PetalburgCity_WallysHouse_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json new file mode 100644 index 0000000000..b6a152be29 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", + "name": "PetalburgCity_WallysHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_WallysHouse_EventScript_204278", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_WallysHouse_EventScript_2042C0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc deleted file mode 100644 index 95326cedfe..0000000000 --- a/data/maps/PetalburgWoods/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -PetalburgWoods_EventObjects: - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, FLAG_ITEM_PETALBURG_WOODS_X_ATTACK - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, FLAG_ITEM_PETALBURG_WOODS_ETHER - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 - -PetalburgWoods_MapWarps: - warp_def 14, 5, 0, 2, MAP_ROUTE104 - warp_def 15, 5, 0, 3, MAP_ROUTE104 - warp_def 16, 38, 0, 4, MAP_ROUTE104 - warp_def 17, 38, 0, 5, MAP_ROUTE104 - warp_def 36, 38, 0, 6, MAP_ROUTE104 - warp_def 37, 38, 0, 7, MAP_ROUTE104 - -PetalburgWoods_MapCoordEvents: - coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7 - coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079 - -PetalburgWoods_MapBGEvents: - bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B - bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION - bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 - bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 - bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL - bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 - -PetalburgWoods_MapEvents:: - map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents - diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc deleted file mode 100644 index 530c2f2aa4..0000000000 --- a/data/maps/PetalburgWoods/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgWoods: - .4byte PetalburgWoods_Layout - .4byte PetalburgWoods_MapEvents - .4byte PetalburgWoods_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_PETALBURG_WOODS - .byte MAPSEC_PETALBURG_WOODS - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json new file mode 100644 index 0000000000..9a5f051b39 --- /dev/null +++ b/data/maps/PetalburgWoods/map.json @@ -0,0 +1,301 @@ +{ + "id": "MAP_PETALBURG_WOODS", + "name": "PetalburgWoods", + "layout": "LAYOUT_PETALBURG_WOODS", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_PETALBURG_WOODS", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 19, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 26, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 26, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 45, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_29110F", + "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 35, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_291102", + "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_29111C", + "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 15, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E210", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 7, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PetalburgWoods_EventScript_22E26D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PetalburgWoods_EventScript_22E284", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 30, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E219", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_291129", + "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E222", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 2 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 4 + }, + { + "x": 17, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 5 + }, + { + "x": 36, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 6 + }, + { + "x": 37, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 7 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 26, + "y": 23, + "elevation": 3, + "var": "VAR_0x4098", + "var_value": 0, + "script": "PetalburgWoods_EventScript_22DFD7" + }, + { + "type": "trigger", + "x": 27, + "y": 23, + "elevation": 3, + "var": "VAR_0x4098", + "var_value": 0, + "script": "PetalburgWoods_EventScript_22E079" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 32, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgWoods_EventScript_22E25B" + }, + { + "type": "hidden_item", + "x": 39, + "y": 35, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION" + }, + { + "type": "hidden_item", + "x": 26, + "y": 6, + "elevation": 3, + "item": "ITEM_TINY_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1" + }, + { + "type": "hidden_item", + "x": 40, + "y": 29, + "elevation": 3, + "item": "ITEM_TINY_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2" + }, + { + "type": "hidden_item", + "x": 4, + "y": 19, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL" + }, + { + "type": "sign", + "x": 11, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgWoods_EventScript_22E264" + } + ] +} \ No newline at end of file diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc deleted file mode 100644 index 44829f60d4..0000000000 --- a/data/maps/RecordCorner/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -RecordCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 - -RecordCorner_MapWarps: - warp_def 8, 9, 3, 127, MAP_NONE - warp_def 9, 9, 3, 127, MAP_NONE - warp_def 11, 9, 3, 127, MAP_NONE - warp_def 10, 9, 3, 127, MAP_NONE - -RecordCorner_MapCoordEvents: - coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D - coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 - coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 - coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C - -RecordCorner_MapEvents:: - map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 - diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc deleted file mode 100644 index 0a3254abdb..0000000000 --- a/data/maps/RecordCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RecordCorner: - .4byte RecordCorner_Layout - .4byte RecordCorner_MapEvents - .4byte RecordCorner_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_RECORD_CORNER - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json new file mode 100644 index 0000000000..98bcc02012 --- /dev/null +++ b/data/maps/RecordCorner/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_RECORD_CORNER", + "name": "RecordCorner", + "layout": "LAYOUT_RECORD_CORNER", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RecordCorner_EventScript_2774C6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827741D" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277447" + }, + { + "type": "trigger", + "x": 13, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277432" + }, + { + "type": "trigger", + "x": 13, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827745C" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc deleted file mode 100644 index 32ee511a8f..0000000000 --- a/data/maps/Route101/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route101_MapConnectionsList: - connection up, 0, MAP_OLDALE_TOWN - connection down, 0, MAP_LITTLEROOT_TOWN - -Route101_MapConnections: - .4byte 2 - .4byte Route101_MapConnectionsList - diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc deleted file mode 100644 index b14649cc0f..0000000000 --- a/data/maps/Route101/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -Route101_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY - -Route101_MapCoordEvents: - coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE - coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE - coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E - coord_event 11, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E - coord_event 6, 16, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 15, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 17, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A - -Route101_MapBGEvents: - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D - -Route101_MapEvents:: - map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents - diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc deleted file mode 100644 index b40de8df96..0000000000 --- a/data/maps/Route101/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route101: - .4byte Route101_Layout - .4byte Route101_MapEvents - .4byte Route101_MapScripts - .4byte Route101_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE101 - .byte MAPSEC_ROUTE_101 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json new file mode 100644 index 0000000000..673db80eab --- /dev/null +++ b/data/maps/Route101/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_ROUTE101", + "name": "Route101", + "layout": "LAYOUT_ROUTE101", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_101", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_LITTLEROOT_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 16, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBDFB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 9, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBE16", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1", + "x": 10, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_272141", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 2, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBE04", + "flag": "FLAG_HIDE_ROUTE_101_BOY" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 1, + "script": "Route101_EventScript_1EBCDE" + }, + { + "type": "trigger", + "x": 11, + "y": 19, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 1, + "script": "Route101_EventScript_1EBCDE" + }, + { + "type": "trigger", + "x": 10, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD4E" + }, + { + "type": "trigger", + "x": 11, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD4E" + }, + { + "type": "trigger", + "x": 6, + "y": 16, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 15, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 17, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 7, + "y": 13, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD7A" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route101_EventScript_1EBE0D" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc deleted file mode 100644 index 1b76d47f5f..0000000000 --- a/data/maps/Route102/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route102_MapConnectionsList: - connection left, -10, MAP_PETALBURG_CITY - connection right, 0, MAP_OLDALE_TOWN - -Route102_MapConnections: - .4byte 2 - .4byte Route102_MapConnectionsList - diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc deleted file mode 100644 index 65acbee41e..0000000000 --- a/data/maps/Route102/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -Route102_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_ITEM_ROUTE_102_POTION - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 - -Route102_MapBGEvents: - bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 - bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA - -Route102_MapEvents:: - map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents - diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc deleted file mode 100644 index 6b5c24b0c6..0000000000 --- a/data/maps/Route102/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route102: - .4byte Route102_Layout - .4byte Route102_MapEvents - .4byte Route102_MapScripts - .4byte Route102_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE102 - .byte MAPSEC_ROUTE_102 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json new file mode 100644 index 0000000000..e6418c42c2 --- /dev/null +++ b/data/maps/Route102/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_ROUTE102", + "name": "Route102", + "layout": "LAYOUT_ROUTE102", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_102", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": -10, + "map": "MAP_PETALBURG_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 18, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_1EC0E1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 33, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC105", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 25, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route102_EventScript_1EC1B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC1CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 37, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_1EC0FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_290CD8", + "flag": "FLAG_ITEM_ROUTE_102_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 2, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 25, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC1E1", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 17, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route102_EventScript_1EC0F3" + }, + { + "type": "sign", + "x": 40, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route102_EventScript_1EC0EA" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc deleted file mode 100644 index cff488cf2e..0000000000 --- a/data/maps/Route103/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route103_MapConnectionsList: - connection down, 0, MAP_OLDALE_TOWN - connection right, -60, MAP_ROUTE110 - -Route103_MapConnections: - .4byte 2 - .4byte Route103_MapConnectionsList - diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc deleted file mode 100644 index 8794121571..0000000000 --- a/data/maps/Route103/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route103_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 - object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH - object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13 - object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 - object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 - object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 - object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP - -Route103_MapWarps: - warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE - -Route103_MapBGEvents: - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB - -Route103_MapEvents:: - map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents - diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc deleted file mode 100644 index 942ec632cb..0000000000 --- a/data/maps/Route103/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route103: - .4byte Route103_Layout - .4byte Route103_MapEvents - .4byte Route103_MapScripts - .4byte Route103_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE103 - .byte MAPSEC_ROUTE_103 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json new file mode 100644 index 0000000000..516c4ed8fc --- /dev/null +++ b/data/maps/Route103/map.json @@ -0,0 +1,309 @@ +{ + "id": "MAP_ROUTE103", + "name": "Route103", + "layout": "LAYOUT_ROUTE103", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_103", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + }, + { + "direction": "right", + "offset": -60, + "map": "MAP_ROUTE110" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 49, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC5E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC3C1", + "flag": "FLAG_HIDE_ROUTE_103_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 71, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route103_EventScript_1EC5F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 65, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route103_EventScript_1EC66E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 64, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route103_EventScript_1EC60B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 50, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route103_EventScript_1EC6D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 58, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 5, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 59, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 6, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 60, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 7, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC5D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_272141", + "flag": "FLAG_HIDE_ROUTE_103_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 56, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC6E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 50, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_290CE5", + "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 67, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 72, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 67, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route103_EventScript_1EC761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 67, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route103_EventScript_1EC74A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 36, + "y": 6, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC78F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 36, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC778", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 64, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_290CF2", + "flag": "FLAG_ITEM_ROUTE_103_PP_UP" + } + ], + "warp_events": [ + { + "x": 45, + "y": 6, + "elevation": 0, + "dest_map": "MAP_ALTERING_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route103_EventScript_1EC5EB" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc deleted file mode 100644 index 193f898335..0000000000 --- a/data/maps/Route104/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route104_MapConnectionsList: - connection up, 0, MAP_RUSTBORO_CITY - connection down, 0, MAP_ROUTE105 - connection right, 50, MAP_PETALBURG_CITY - -Route104_MapConnections: - .4byte 3 - .4byte Route104_MapConnectionsList - diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc deleted file mode 100644 index 8b67a0854a..0000000000 --- a/data/maps/Route104/events.inc +++ /dev/null @@ -1,64 +0,0 @@ -Route104_EventObjects: - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT - object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_F, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, FLAG_ITEM_ROUTE_104_PP_UP - object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST - object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 - object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 - object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, FLAG_ITEM_ROUTE_104_POKE_BALL - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, FLAG_ITEM_ROUTE_104_X_ACCURACY - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, FLAG_TEMP_11 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL - -Route104_MapWarps: - warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE - warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS - warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS - warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS - warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS - warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS - warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS - -Route104_MapCoordEvents: - coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 - -Route104_MapBGEvents: - bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 - bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033 - bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C - bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION - bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL - bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION - bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE - bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE - -Route104_MapEvents:: - map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents - diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc deleted file mode 100644 index 6f8e0776b7..0000000000 --- a/data/maps/Route104/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104: - .4byte Route104_Layout - .4byte Route104_MapEvents - .4byte Route104_MapScripts - .4byte Route104_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104 - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json new file mode 100644 index 0000000000..733ad49899 --- /dev/null +++ b/data/maps/Route104/map.json @@ -0,0 +1,627 @@ +{ + "id": "MAP_ROUTE104", + "name": "Route104", + "layout": "LAYOUT_ROUTE104", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE105" + }, + { + "direction": "right", + "offset": 50, + "map": "MAP_PETALBURG_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 15, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED00F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 25, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED006", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 31, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route104_EventScript_1ED38D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 27, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED045", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 30, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED04E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 28, + "y": 74, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED090", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 12, + "y": 54, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 51, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 29, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED35F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 34, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 8, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 9, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 10, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 22, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 11, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 23, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 12, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 13, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 37, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECF8C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 4, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 75, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 76, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 39, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290CFF", + "flag": "FLAG_ITEM_ROUTE_104_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECFCD", + "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route104_EventScript_1ED597", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 28, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route104_EventScript_1ED5B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route104_EventScript_1ED43B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route104_EventScript_1ED4E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D0C", + "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 18, + "y": 67, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 5, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route104_EventScript_1ED376", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 37, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D19", + "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 35, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D26", + "flag": "FLAG_ITEM_ROUTE_104_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED057", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 15, + "y": 59, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED5D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 17, + "y": 50, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECC9E", + "flag": "FLAG_HIDE_ROUTE_104_RIVAL" + } + ], + "warp_events": [ + { + "x": 17, + "y": 50, + "elevation": 0, + "dest_map": "MAP_ROUTE104_MR_BRINEYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 4 + }, + { + "x": 33, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 51, + "elevation": 3, + "var": "VAR_0x4063", + "var_value": 1, + "script": "Route104_EventScript_1ECCB3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 20, + "y": 50, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED018" + }, + { + "type": "sign", + "x": 27, + "y": 66, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED021" + }, + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED02A" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED033" + }, + { + "type": "sign", + "x": 17, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED03C" + }, + { + "type": "hidden_item", + "x": 7, + "y": 6, + "elevation": 3, + "item": "ITEM_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION" + }, + { + "type": "hidden_item", + "x": 3, + "y": 9, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 14, + "y": 55, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POTION" + }, + { + "type": "hidden_item", + "x": 16, + "y": 72, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE" + }, + { + "type": "hidden_item", + "x": 16, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc deleted file mode 100644 index d1924756c3..0000000000 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route104_MrBrineysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO - -Route104_MrBrineysHouse_MapWarps: - warp_def 5, 8, 0, 0, MAP_ROUTE104 - warp_def 6, 8, 0, 0, MAP_ROUTE104 - -Route104_MrBrineysHouse_MapEvents:: - map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc deleted file mode 100644 index 784db2d2da..0000000000 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MrBrineysHouse: - .4byte Route104_MrBrineysHouse_Layout - .4byte Route104_MrBrineysHouse_MapEvents - .4byte Route104_MrBrineysHouse_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_ROUTE104_MR_BRINEYS_HOUSE - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json new file mode 100644 index 0000000000..bdd2361e06 --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", + "name": "Route104_MrBrineysHouse", + "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_MrBrineysHouse_EventScript_229D67", + "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_MrBrineysHouse_EventScript_229E5D", + "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc deleted file mode 100644 index c33268ff65..0000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route104_PrettyPetalFlowerShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 - -Route104_PrettyPetalFlowerShop_MapWarps: - warp_def 2, 8, 0, 1, MAP_ROUTE104 - warp_def 3, 8, 0, 1, MAP_ROUTE104 - -Route104_PrettyPetalFlowerShop_MapEvents:: - map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc deleted file mode 100644 index b201d0a3e5..0000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrettyPetalFlowerShop: - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte Route104_PrettyPetalFlowerShop_MapEvents - .4byte Route104_PrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json new file mode 100644 index 0000000000..cd00d18e1c --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrettyPetalFlowerShop", + "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 11, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc deleted file mode 100644 index 4f1dfef12a..0000000000 --- a/data/maps/Route104_Prototype/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_Prototype_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc deleted file mode 100644 index 7bc8d0a876..0000000000 --- a/data/maps/Route104_Prototype/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_Prototype: - .4byte Route104_Prototype_Layout - .4byte Route104_Prototype_MapEvents - .4byte Route104_Prototype_MapScripts - .4byte 0x0 - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104_PROTOTYPE - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json new file mode 100644 index 0000000000..168cee142c --- /dev/null +++ b/data/maps/Route104_Prototype/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_ROUTE104_PROTOTYPE", + "name": "Route104_Prototype", + "layout": "LAYOUT_ROUTE104_PROTOTYPE", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc deleted file mode 100644 index 76dd77e02a..0000000000 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc deleted file mode 100644 index 53b543e4eb..0000000000 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop: - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents - .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json new file mode 100644 index 0000000000..f50dced01e --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrototypePrettyPetalFlowerShop", + "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc deleted file mode 100644 index 89c412cc6a..0000000000 --- a/data/maps/Route105/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route105_MapConnectionsList: - connection up, 0, MAP_ROUTE104 - connection down, 0, MAP_ROUTE106 - connection dive, 0, MAP_UNDERWATER6 - -Route105_MapConnections: - .4byte 3 - .4byte Route105_MapConnectionsList - diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc deleted file mode 100644 index 851a26fdc7..0000000000 --- a/data/maps/Route105/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route105_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 - object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 - object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 - -Route105_MapWarps: - warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE - -Route105_MapBGEvents: - bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE - bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL - -Route105_MapEvents:: - map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents - diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc deleted file mode 100644 index ac3e766dd1..0000000000 --- a/data/maps/Route105/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route105: - .4byte Route105_Layout - .4byte Route105_MapEvents - .4byte Route105_MapScripts - .4byte Route105_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE105 - .byte MAPSEC_ROUTE_105 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json new file mode 100644 index 0000000000..937582affe --- /dev/null +++ b/data/maps/Route105/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_ROUTE105", + "name": "Route105", + "layout": "LAYOUT_ROUTE105", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_105", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE104" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE106" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER6" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 19, + "y": 60, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route105_EventScript_1EE261", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 27, + "y": 36, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 7, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE278", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 8, + "y": 45, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE28F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 19, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE2A6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 73, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route105_EventScript_290D33", + "flag": "FLAG_ITEM_ROUTE_105_IRON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 17, + "y": 48, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE24A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route105_EventScript_1EE2BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 58, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route105_EventScript_1EE2D4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 15, + "y": 68, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 5, + "y": 56, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc deleted file mode 100644 index f48a08bd80..0000000000 --- a/data/maps/Route106/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route106_MapConnectionsList: - connection up, 0, MAP_ROUTE105 - connection down, 60, MAP_DEWFORD_TOWN - -Route106_MapConnections: - .4byte 2 - .4byte Route106_MapConnectionsList - diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc deleted file mode 100644 index 6454fc188b..0000000000 --- a/data/maps/Route106/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route106_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN - -Route106_MapWarps: - warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F - -Route106_MapBGEvents: - bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL - bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST - bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE - bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A - -Route106_MapEvents:: - map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents - diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc deleted file mode 100644 index 01c7b9ae6d..0000000000 --- a/data/maps/Route106/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route106: - .4byte Route106_Layout - .4byte Route106_MapEvents - .4byte Route106_MapScripts - .4byte Route106_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE106 - .byte MAPSEC_ROUTE_106 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json new file mode 100644 index 0000000000..fd86567e96 --- /dev/null +++ b/data/maps/Route106/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_ROUTE106", + "name": "Route106", + "layout": "LAYOUT_ROUTE106", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_106", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE105" + }, + { + "direction": "down", + "offset": 60, + "map": "MAP_DEWFORD_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 18, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE493", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 29, + "y": 10, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE4AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 51, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route106_EventScript_1EE4C1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 65, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE523", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route106_EventScript_290D40", + "flag": "FLAG_ITEM_ROUTE_106_PROTEIN" + } + ], + "warp_events": [ + { + "x": 48, + "y": 16, + "elevation": 0, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 41, + "y": 11, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 53, + "y": 12, + "elevation": 0, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST" + }, + { + "type": "hidden_item", + "x": 68, + "y": 15, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE" + }, + { + "type": "sign", + "x": 59, + "y": 13, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route106_EventScript_1EE48A" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc deleted file mode 100644 index d1bb18b873..0000000000 --- a/data/maps/Route107/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route107_MapConnectionsList: - connection left, 0, MAP_DEWFORD_TOWN - connection right, 0, MAP_ROUTE108 - -Route107_MapConnections: - .4byte 2 - .4byte Route107_MapConnectionsList - diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc deleted file mode 100644 index 461d8cd86c..0000000000 --- a/data/maps/Route107/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route107_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route107_EventScript_1EE625, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 - -Route107_MapEvents:: - map_events Route107_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc deleted file mode 100644 index db53b811dd..0000000000 --- a/data/maps/Route107/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route107: - .4byte Route107_Layout - .4byte Route107_MapEvents - .4byte Route107_MapScripts - .4byte Route107_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE107 - .byte MAPSEC_ROUTE_107 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json new file mode 100644 index 0000000000..dcb17ed8c7 --- /dev/null +++ b/data/maps/Route107/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_ROUTE107", + "name": "Route107", + "layout": "LAYOUT_ROUTE107", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_107", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_DEWFORD_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE108" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 41, + "y": 10, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route107_EventScript_1EE595", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 23, + "y": 11, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 6, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route107_EventScript_1EE5AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 16, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE60E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 50, + "y": 11, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE625", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 33, + "y": 4, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route107_EventScript_1EE63C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 32, + "y": 4, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route107_EventScript_1EE657", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 50, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE672", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc deleted file mode 100644 index 9b2d0f1f90..0000000000 --- a/data/maps/Route108/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route108_MapConnectionsList: - connection left, 0, MAP_ROUTE107 - connection right, -40, MAP_ROUTE109 - -Route108_MapConnections: - .4byte 2 - .4byte Route108_MapConnectionsList - diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc deleted file mode 100644 index 9e1a088c08..0000000000 --- a/data/maps/Route108/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -Route108_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE - -Route108_MapWarps: - warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK - -Route108_MapBGEvents: - bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY - -Route108_MapEvents:: - map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents - diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc deleted file mode 100644 index 97d4a879d1..0000000000 --- a/data/maps/Route108/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route108: - .4byte Route108_Layout - .4byte Route108_MapEvents - .4byte Route108_MapScripts - .4byte Route108_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE108 - .byte MAPSEC_ROUTE_108 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json new file mode 100644 index 0000000000..daa9dab75a --- /dev/null +++ b/data/maps/Route108/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_ROUTE108", + "name": "Route108", + "layout": "LAYOUT_ROUTE108", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_108", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE107" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE109" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 52, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE68A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 35, + "y": 12, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 13, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6A1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6CF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 41, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route108_EventScript_1EE6E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 43, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route108_EventScript_1EE6FD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 42, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route108_EventScript_290D4D", + "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE" + } + ], + "warp_events": [ + { + "x": 29, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 14, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc deleted file mode 100644 index d74fc08ddf..0000000000 --- a/data/maps/Route109/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route109_MapConnectionsList: - connection up, 0, MAP_SLATEPORT_CITY - connection left, 40, MAP_ROUTE108 - -Route109_MapConnections: - .4byte 2 - .4byte Route109_MapConnectionsList - diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc deleted file mode 100644 index efd0e896fd..0000000000 --- a/data/maps/Route109/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -Route109_EventObjects: - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, FLAG_ITEM_ROUTE_109_PP_UP - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0 - object_event 16, EVENT_OBJ_GFX_POKEFAN_F, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 - object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 - object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION - object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 - -Route109_MapWarps: - warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE - -Route109_MapBGEvents: - bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B - bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 - bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE - bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 - bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL - bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER - bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 - bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 - -Route109_MapEvents:: - map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents - diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc deleted file mode 100644 index 9de12f3e68..0000000000 --- a/data/maps/Route109/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109: - .4byte Route109_Layout - .4byte Route109_MapEvents - .4byte Route109_MapScripts - .4byte Route109_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE109 - .byte MAPSEC_ROUTE_109 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json new file mode 100644 index 0000000000..b3bd9f507e --- /dev/null +++ b/data/maps/Route109/map.json @@ -0,0 +1,417 @@ +{ + "id": "MAP_ROUTE109", + "name": "Route109", + "layout": "LAYOUT_ROUTE109", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_109", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE108" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 21, + "y": 26, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 21, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE910", + "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 12, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route109_EventScript_1EEA3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 25, + "y": 39, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route109_EventScript_1EEA54", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 15, + "y": 17, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEA6B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route109_EventScript_1EEA82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEA99", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 22, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route109_EventScript_1EEAFB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE995", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_290D5A", + "flag": "FLAG_ITEM_ROUTE_109_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 29, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 28, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB5D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 21, + "y": 56, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 24, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE99E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE9B5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 30, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 8, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEBBD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 9, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEBA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 33, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA0F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 32, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA18", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 17, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route109_EventScript_1EEBEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route109_EventScript_1EEBD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_290D67", + "flag": "FLAG_ITEM_ROUTE_109_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 17, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEC06", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE109_SEASHORE_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route109_EventScript_1EEA2B" + }, + { + "type": "sign", + "x": 29, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route109_EventScript_1EEA34" + }, + { + "type": "hidden_item", + "x": 16, + "y": 23, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE" + }, + { + "type": "hidden_item", + "x": 33, + "y": 5, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 9, + "y": 10, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL" + }, + { + "type": "hidden_item", + "x": 28, + "y": 20, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_ETHER" + }, + { + "type": "hidden_item", + "x": 13, + "y": 16, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2" + }, + { + "type": "hidden_item", + "x": 8, + "y": 42, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc deleted file mode 100644 index 7ef23ad7f5..0000000000 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route109_SeashoreHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 - -Route109_SeashoreHouse_MapWarps: - warp_def 6, 9, 0, 0, MAP_ROUTE109 - warp_def 7, 9, 0, 0, MAP_ROUTE109 - -Route109_SeashoreHouse_MapEvents:: - map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc deleted file mode 100644 index d8109deaca..0000000000 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_SeashoreHouse: - .4byte Route109_SeashoreHouse_Layout - .4byte Route109_SeashoreHouse_MapEvents - .4byte Route109_SeashoreHouse_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_ROUTE109_SEASHORE_HOUSE - .byte MAPSEC_ROUTE_109 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json new file mode 100644 index 0000000000..e30fcc078e --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE109_SEASHORE_HOUSE", + "name": "Route109_SeashoreHouse", + "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_ROUTE_109", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_SeashoreHouse_EventScript_2693FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_2694E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_269518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_2694FD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ROUTE109", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ROUTE109", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc deleted file mode 100644 index d0334b8c5c..0000000000 --- a/data/maps/Route110/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route110_MapConnectionsList: - connection up, 0, MAP_MAUVILLE_CITY - connection down, 0, MAP_SLATEPORT_CITY - connection left, 60, MAP_ROUTE103 - -Route110_MapConnections: - .4byte 3 - .4byte Route110_MapConnectionsList - diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc deleted file mode 100644 index 349670c135..0000000000 --- a/data/maps/Route110/events.inc +++ /dev/null @@ -1,79 +0,0 @@ -Route110_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF314, 0 - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF302, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_1EF529, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_1EF540, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_1EF409, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 1, 4, Route110_EventScript_1EF420, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_1EF482, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, FLAG_ITEM_ROUTE_110_DIRE_HIT - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, FLAG_ITEM_ROUTE_109_RARE_CANDY - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 - object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_1 - object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_2 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 - object_event 31, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 - object_event 32, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 - object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 - object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH - -Route110_MapWarps: - 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_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: - coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 - coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 - coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D - coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758 - coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763 - coord_event 7, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9CB - coord_event 8, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9D6 - coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1 - coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC - -Route110_MapBGEvents: - bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353 - bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365 - bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A - bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF341 - bg_event 7, 79, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF35C - bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF36E - bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 - bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 - bg_event 33, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF377 - bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380 - bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389 - bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392 - bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE - bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL - bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL - bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL - bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A - -Route110_MapEvents:: - map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents - diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc deleted file mode 100644 index 5edb81ec43..0000000000 --- a/data/maps/Route110/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110: - .4byte Route110_Layout - .4byte Route110_MapEvents - .4byte Route110_MapScripts - .4byte Route110_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE110 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json new file mode 100644 index 0000000000..1891b89f78 --- /dev/null +++ b/data/maps/Route110/map.json @@ -0,0 +1,765 @@ +{ + "id": "MAP_ROUTE110", + "name": "Route110", + "layout": "LAYOUT_ROUTE110", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "left", + "offset": 60, + "map": "MAP_ROUTE103" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 17, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF338", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 29, + "y": 79, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF32F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 14, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF326", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 9, + "y": 57, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF314", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF31D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 27, + "y": 24, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF30B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF302", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 16, + "y": 73, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", + "movement_range_x": 2, + "movement_range_y": 14, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF529", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 19, + "y": 31, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 10, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF4B0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 30, + "y": 31, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_EventScript_1EF540", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 16, + "y": 55, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF4C7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 3, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_EventScript_1EF3F2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 33, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_EventScript_1EF409", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 34, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_EventScript_1EF420", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 10, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_EventScript_1EF482", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 16, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 17, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 18, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D81", + "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D74", + "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 27, + "y": 92, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF3B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 7, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2AA", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2C0", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 9, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2D6", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2EC", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 82, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 21, + "y": 78, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 7, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF499", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 34, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 34, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 33, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF604", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF5A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF61C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 10, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_EventScript_1EF64A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 36, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF633", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D8E", + "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 9, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_BIRCH" + } + ], + "warp_events": [ + { + "x": 35, + "y": 24, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 66, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 16, + "y": 88, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 88, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 28, + "y": 92, + "elevation": 3, + "var": "VAR_CYCLING_CHALLENGE_STATE", + "var_value": 2, + "script": "Route110_EventScript_1EF661" + }, + { + "type": "trigger", + "x": 29, + "y": 92, + "elevation": 3, + "var": "VAR_CYCLING_CHALLENGE_STATE", + "var_value": 2, + "script": "Route110_EventScript_1EF661" + }, + { + "type": "trigger", + "x": 33, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF74D" + }, + { + "type": "trigger", + "x": 34, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF758" + }, + { + "type": "trigger", + "x": 35, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF763" + }, + { + "type": "trigger", + "x": 7, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9CB" + }, + { + "type": "trigger", + "x": 8, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9D6" + }, + { + "type": "trigger", + "x": 9, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9E1" + }, + { + "type": "trigger", + "x": 10, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9EC" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 25, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF353" + }, + { + "type": "sign", + "x": 9, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF365" + }, + { + "type": "sign", + "x": 14, + "y": 88, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF34A" + }, + { + "type": "sign", + "x": 20, + "y": 94, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF341" + }, + { + "type": "sign", + "x": 7, + "y": 79, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF35C" + }, + { + "type": "sign", + "x": 3, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF36E" + }, + { + "type": "secret_base", + "x": 16, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_1" + }, + { + "type": "secret_base", + "x": 17, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_1" + }, + { + "type": "sign", + "x": 33, + "y": 39, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF377" + }, + { + "type": "sign", + "x": 37, + "y": 70, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF380" + }, + { + "type": "sign", + "x": 8, + "y": 67, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF389" + }, + { + "type": "sign", + "x": 32, + "y": 93, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF392" + }, + { + "type": "hidden_item", + "x": 35, + "y": 39, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE" + }, + { + "type": "hidden_item", + "x": 33, + "y": 45, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL" + }, + { + "type": "hidden_item", + "x": 4, + "y": 35, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 37, + "y": 67, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL" + }, + { + "type": "sign", + "x": 13, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF34A" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc deleted file mode 100644 index f9050259c1..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 - -Route110_SeasideCyclingRoadNorthEntrance_MapWarps: - 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: - coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 - coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 - -Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: - 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 deleted file mode 100644 index 008df77af3..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance: - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json new file mode 100644 index 0000000000..119d5b55cb --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "name": "Route110_SeasideCyclingRoadNorthEntrance", + "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 4 + }, + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 4 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 5 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84" + }, + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc deleted file mode 100644 index f64836526e..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 - -Route110_SeasideCyclingRoadSouthEntrance_MapWarps: - 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: - coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 - coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 - -Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: - 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 deleted file mode 100644 index be2646ee27..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance: - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json new file mode 100644 index 0000000000..c5c63def13 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "name": "Route110_SeasideCyclingRoadSouthEntrance", + "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0" + }, + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc deleted file mode 100644 index 814e46cbe9..0000000000 --- a/data/maps/Route110_TrickHouseCorridor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route110_TrickHouseCorridor_MapWarps: - warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - -Route110_TrickHouseCorridor_MapEvents:: - map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc deleted file mode 100644 index 2a60d20d8f..0000000000 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseCorridor: - .4byte Route110_TrickHouseCorridor_Layout - .4byte Route110_TrickHouseCorridor_MapEvents - .4byte Route110_TrickHouseCorridor_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json new file mode 100644 index 0000000000..a488e96613 --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", + "name": "Route110_TrickHouseCorridor", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 23, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 23, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc deleted file mode 100644 index 82088646e1..0000000000 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_TrickHouseEnd_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN - -Route110_TrickHouseEnd_MapWarps: - warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 - warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR - -Route110_TrickHouseEnd_MapCoordEvents: - coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 - -Route110_TrickHouseEnd_MapBGEvents: - bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET - -Route110_TrickHouseEnd_MapEvents:: - map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents - diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc deleted file mode 100644 index 0c2dfac3ad..0000000000 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEnd: - .4byte Route110_TrickHouseEnd_Layout - .4byte Route110_TrickHouseEnd_MapEvents - .4byte Route110_TrickHouseEnd_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_END - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json new file mode 100644 index 0000000000..dafcec8a67 --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_END", + "name": "Route110_TrickHouseEnd", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHouseEnd_EventScript_26AD17", + "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHouseEnd_EventScript_26B041" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 4, + "y": 5, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc deleted file mode 100644 index 791ecbbc54..0000000000 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route110_TrickHouseEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN - -Route110_TrickHouseEntrance_MapWarps: - warp_def 5, 7, 3, 1, MAP_ROUTE110 - warp_def 6, 7, 3, 1, MAP_ROUTE110 - warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 - -Route110_TrickHouseEntrance_MapCoordEvents: - coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - -Route110_TrickHouseEntrance_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 - -Route110_TrickHouseEntrance_MapEvents:: - map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents - diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc deleted file mode 100644 index 0f5f0aad59..0000000000 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEntrance: - .4byte Route110_TrickHouseEntrance_Layout - .4byte Route110_TrickHouseEntrance_MapEvents - .4byte Route110_TrickHouseEntrance_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json new file mode 100644 index 0000000000..2f85d66c59 --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "name": "Route110_TrickHouseEntrance", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHouseEntrance_EventScript_269D3B", + "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 7, + "y": 7, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route110_TrickHouseEntrance_EventScript_26A0D3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc deleted file mode 100644 index 3a2bb131c6..0000000000 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -Route110_TrickHousePuzzle1_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_19 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_18 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1B - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E - -Route110_TrickHousePuzzle1_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle1_MapBGEvents: - bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B - -Route110_TrickHousePuzzle1_MapEvents:: - map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc deleted file mode 100644 index 5835faa5fd..0000000000 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle1: - .4byte Route110_TrickHousePuzzle1_Layout - .4byte Route110_TrickHousePuzzle1_MapEvents - .4byte Route110_TrickHousePuzzle1_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json new file mode 100644 index 0000000000..283e867939 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "name": "Route110_TrickHousePuzzle1", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_TrickHousePuzzle1_EventScript_26B948", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle1_EventScript_26B95F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle1_EventScript_26B976", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 13, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_29140E", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1C" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 2, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1E" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle1_EventScript_26B92B" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc deleted file mode 100644 index c56d53dea0..0000000000 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route110_TrickHousePuzzle2_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL - -Route110_TrickHousePuzzle2_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle2_MapCoordEvents: - coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD - coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 - coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 - coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 - -Route110_TrickHousePuzzle2_MapBGEvents: - bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 - -Route110_TrickHousePuzzle2_MapEvents:: - map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc deleted file mode 100644 index b957dac781..0000000000 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle2: - .4byte Route110_TrickHousePuzzle2_Layout - .4byte Route110_TrickHousePuzzle2_MapEvents - .4byte Route110_TrickHousePuzzle2_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json new file mode 100644 index 0000000000..0c49c00f27 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", + "name": "Route110_TrickHousePuzzle2", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC75", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_291428", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_29141B", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 11, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD" + }, + { + "type": "trigger", + "x": 0, + "y": 4, + "elevation": 0, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0" + }, + { + "type": "trigger", + "x": 14, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC03" + }, + { + "type": "trigger", + "x": 7, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC16" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle2_EventScript_26BBC0" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc deleted file mode 100644 index 6e3406753f..0000000000 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route110_TrickHousePuzzle3_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16 - -Route110_TrickHousePuzzle3_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle3_MapCoordEvents: - coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD - coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 - coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 - coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 - -Route110_TrickHousePuzzle3_MapBGEvents: - bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 - -Route110_TrickHousePuzzle3_MapEvents:: - map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc deleted file mode 100644 index b367f850e3..0000000000 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle3: - .4byte Route110_TrickHousePuzzle3_Layout - .4byte Route110_TrickHousePuzzle3_MapEvents - .4byte Route110_TrickHousePuzzle3_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json new file mode 100644 index 0000000000..8a60428d26 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -0,0 +1,180 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", + "name": "Route110_TrickHousePuzzle3", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_291442", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_291435", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 1, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 2, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 14, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD" + }, + { + "type": "trigger", + "x": 3, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9" + }, + { + "type": "trigger", + "x": 12, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5" + }, + { + "type": "trigger", + "x": 8, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle3_EventScript_26C5A7" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc deleted file mode 100644 index c2de17b66f..0000000000 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route110_TrickHousePuzzle4_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_13 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_14 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_16 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_17 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A - -Route110_TrickHousePuzzle4_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle4_MapBGEvents: - bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 - -Route110_TrickHousePuzzle4_MapEvents:: - map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc deleted file mode 100644 index 9f3f637b9f..0000000000 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle4: - .4byte Route110_TrickHousePuzzle4_Layout - .4byte Route110_TrickHousePuzzle4_MapEvents - .4byte Route110_TrickHousePuzzle4_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json new file mode 100644 index 0000000000..03a953310d --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -0,0 +1,234 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", + "name": "Route110_TrickHousePuzzle4", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle4_EventScript_26C87E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle4_EventScript_26C895", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_29144F", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_1A" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle4_EventScript_26C861" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc deleted file mode 100644 index 88eebe092d..0000000000 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -Route110_TrickHousePuzzle5_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 - -Route110_TrickHousePuzzle5_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle5_MapCoordEvents: - coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 - coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 - coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF - coord_event 2, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB - coord_event 1, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 - coord_event 2, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F - coord_event 13, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B - coord_event 12, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 - coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 - coord_event 13, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 - coord_event 12, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 - coord_event 11, 4, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF - coord_event 1, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 - coord_event 3, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B - coord_event 4, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 - coord_event 5, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 - coord_event 6, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F - coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F - coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B - coord_event 11, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF - coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB - coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 - -Route110_TrickHousePuzzle5_MapBGEvents: - bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 - -Route110_TrickHousePuzzle5_MapEvents:: - map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc deleted file mode 100644 index e179a016a7..0000000000 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle5: - .4byte Route110_TrickHousePuzzle5_Layout - .4byte Route110_TrickHousePuzzle5_MapEvents - .4byte Route110_TrickHousePuzzle5_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json new file mode 100644 index 0000000000..6f995d5e9f --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -0,0 +1,316 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", + "name": "Route110_TrickHousePuzzle5", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 6, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB32", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB53", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 14, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB95", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7" + }, + { + "type": "trigger", + "x": 4, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3" + }, + { + "type": "trigger", + "x": 3, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF" + }, + { + "type": "trigger", + "x": 2, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB" + }, + { + "type": "trigger", + "x": 1, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC13" + }, + { + "type": "trigger", + "x": 2, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B" + }, + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC67" + }, + { + "type": "trigger", + "x": 11, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC73" + }, + { + "type": "trigger", + "x": 13, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC97" + }, + { + "type": "trigger", + "x": 12, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3" + }, + { + "type": "trigger", + "x": 11, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_5", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF" + }, + { + "type": "trigger", + "x": 1, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC07" + }, + { + "type": "trigger", + "x": 3, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B" + }, + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC37" + }, + { + "type": "trigger", + "x": 5, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC43" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F" + }, + { + "type": "trigger", + "x": 10, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F" + }, + { + "type": "trigger", + "x": 9, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B" + }, + { + "type": "trigger", + "x": 11, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF" + }, + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB" + }, + { + "type": "trigger", + "x": 9, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle5_EventScript_26CB15" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc deleted file mode 100644 index 512164dba3..0000000000 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route110_TrickHousePuzzle6_EventObjects: - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL - -Route110_TrickHousePuzzle6_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle6_MapBGEvents: - bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 - -Route110_TrickHousePuzzle6_MapEvents:: - map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc deleted file mode 100644 index ec7a42d200..0000000000 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle6: - .4byte Route110_TrickHousePuzzle6_Layout - .4byte Route110_TrickHousePuzzle6_MapEvents - .4byte Route110_TrickHousePuzzle6_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json new file mode 100644 index 0000000000..b468e59be0 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", + "name": "Route110_TrickHousePuzzle6", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 7, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle6_EventScript_29145C", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle6_EventScript_26DDC4" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc deleted file mode 100644 index 4dff66e1c9..0000000000 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -Route110_TrickHousePuzzle7_EventObjects: - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL - object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 - object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 - object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -Route110_TrickHousePuzzle7_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 13, 4, 0, 4, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 7, 3, 0, 3, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 13, 11, 0, 6, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 4, 3, 0, 5, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 1, 17, 0, 8, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 0, 11, 0, 7, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 2, 3, 0, 10, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 4, 13, 0, 9, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - -Route110_TrickHousePuzzle7_MapCoordEvents: - coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B - coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331 - coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347 - coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D - -Route110_TrickHousePuzzle7_MapBGEvents: - bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 - -Route110_TrickHousePuzzle7_MapEvents:: - map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc deleted file mode 100644 index ca21629e35..0000000000 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle7: - .4byte Route110_TrickHousePuzzle7_Layout - .4byte Route110_TrickHousePuzzle7_MapEvents - .4byte Route110_TrickHousePuzzle7_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json new file mode 100644 index 0000000000..e21657b67c --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -0,0 +1,276 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "name": "Route110_TrickHousePuzzle7", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 9, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E389", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 8, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_291469", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 17, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 8 + }, + { + "x": 0, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 12 + }, + { + "x": 8, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 11 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 19, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E31B" + }, + { + "type": "trigger", + "x": 0, + "y": 14, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E331" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E347" + }, + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E35D" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle7_EventScript_26E1D0" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc deleted file mode 100644 index 2ccba5addd..0000000000 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route110_TrickHousePuzzle8_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL - -Route110_TrickHousePuzzle8_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle8_MapBGEvents: - bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 - -Route110_TrickHousePuzzle8_MapEvents:: - map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc deleted file mode 100644 index 1bf3fbb1cb..0000000000 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle8: - .4byte Route110_TrickHousePuzzle8_Layout - .4byte Route110_TrickHousePuzzle8_MapEvents - .4byte Route110_TrickHousePuzzle8_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json new file mode 100644 index 0000000000..0232237404 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", + "name": "Route110_TrickHousePuzzle8", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E81F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E84D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E836", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle8_EventScript_291476", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 21, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle8_EventScript_26E802" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc deleted file mode 100644 index 25e4099761..0000000000 --- a/data/maps/Route111/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route111_MapConnectionsList: - connection down, 0, MAP_MAUVILLE_CITY - connection left, 0, MAP_ROUTE113 - connection left, 20, MAP_ROUTE112 - -Route111_MapConnections: - .4byte 3 - .4byte Route111_MapConnectionsList - diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc deleted file mode 100644 index 703c9a6627..0000000000 --- a/data/maps/Route111/events.inc +++ /dev/null @@ -1,114 +0,0 @@ -Route111_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE - object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1204, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, FLAG_ITEM_ROUTE_111_TM_37 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, FLAG_ITEM_ROUTE_111_STARDUST - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, FLAG_ITEM_ROUTE_111_HP_UP - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, FLAG_TEMP_13 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 - object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN - object_event 34, EVENT_OBJ_GFX_MAN_4, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 - object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 - object_event 36, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 - object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0 - object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0 - object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 - object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 - object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR - object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL - object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY - -Route111_MapWarps: - warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE - warp_def 29, 87, 0, 0, MAP_DESERT_RUINS - warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP - warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F - warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE - -Route111_MapCoordEvents: - coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 7, 63, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 18, 32, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 31, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 37, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 36, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 8, 64, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 65, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 65, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 11, 66, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 67, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 13, 68, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 14, 69, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 61, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 17, 38, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 16, 39, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 15, 40, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 41, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 42, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD - -Route111_MapBGEvents: - bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C - bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153 - bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165 - bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F116E - bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 - bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 - bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 - bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177 - bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 - bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 - bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST - bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 - bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180 - bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 - bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 - bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN - bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY - bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C - -Route111_MapEvents:: - map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents - diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc deleted file mode 100644 index 2ec5fc6edf..0000000000 --- a/data/maps/Route111/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111: - .4byte Route111_Layout - .4byte Route111_MapEvents - .4byte Route111_MapScripts - .4byte Route111_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE111 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json new file mode 100644 index 0000000000..6e2bdf18a0 --- /dev/null +++ b/data/maps/Route111/map.json @@ -0,0 +1,1115 @@ +{ + "id": "MAP_ROUTE111", + "name": "Route111", + "layout": "LAYOUT_ROUTE111", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE113" + }, + { + "direction": "left", + "offset": 20, + "map": "MAP_ROUTE112" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 13, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F0FC5", + "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 28, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F121B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 19, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 20, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 91, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F1189", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1204", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 27, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F1260", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 21, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route111_EventScript_1F1232", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 32, + "y": 66, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1249", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CDF6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CDD6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 18, + "y": 101, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 19, + "y": 100, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 23, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F0EB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 104, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290D9B", + "flag": "FLAG_ITEM_ROUTE_111_TM_37" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 80, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 19, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 81, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CE96", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CEB6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DA8", + "flag": "FLAG_ITEM_ROUTE_111_STARDUST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DB5", + "flag": "FLAG_ITEM_ROUTE_111_HP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 22, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 10, + "y": 82, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F12D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 11, + "y": 71, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F12C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 32, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F12F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route111_EventScript_1F1369", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 9, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1307", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2765FF", + "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 20, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F1192", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 26, + "y": 132, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route111_EventScript_1F13F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 20, + "y": 132, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route111_EventScript_1F1410", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 19, + "y": 121, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F13E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 16, + "y": 119, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F13CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 29, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route111_EventScript_1F143E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 22, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route111_EventScript_1F1427", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 37, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route111_EventScript_1F1455", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 118, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DC2", + "flag": "FLAG_ITEM_ROUTE_111_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 14, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F119B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 20, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 19, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 19, + "y": 101, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F11E4", + "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY" + } + ], + "warp_events": [ + { + "x": 13, + "y": 113, + "elevation": 0, + "dest_map": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 87, + "elevation": 0, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE111_OLD_LADYS_REST_STOP", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 58, + "elevation": 0, + "dest_map": "MAP_MIRAGE_TOWER_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 113, + "elevation": 0, + "dest_map": "MAP_TRAINER_HILL_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 12, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 13, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 7, + "y": 63, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 12, + "y": 44, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 13, + "y": 43, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 14, + "y": 42, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 16, + "y": 40, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 14, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 18, + "y": 32, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 17, + "y": 31, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 9, + "y": 37, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 36, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 17, + "y": 39, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 18, + "y": 38, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 8, + "y": 64, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 9, + "y": 65, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 65, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 11, + "y": 66, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 12, + "y": 67, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 13, + "y": 68, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 14, + "y": 69, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 61, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 13, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 14, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 17, + "y": 38, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 16, + "y": 39, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 15, + "y": 40, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 14, + "y": 41, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 13, + "y": 42, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 12, + "y": 43, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 44, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 114, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F115C" + }, + { + "type": "sign", + "x": 24, + "y": 126, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1153" + }, + { + "type": "sign", + "x": 7, + "y": 66, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1165" + }, + { + "type": "sign", + "x": 13, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F116E" + }, + { + "type": "secret_base", + "x": 24, + "y": 36, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_1" + }, + { + "type": "secret_base", + "x": 34, + "y": 50, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_1" + }, + { + "type": "secret_base", + "x": 33, + "y": 34, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_1" + }, + { + "type": "sign", + "x": 25, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1177" + }, + { + "type": "secret_base", + "x": 35, + "y": 1, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_3" + }, + { + "type": "secret_base", + "x": 35, + "y": 31, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 26, + "y": 70, + "elevation": 0, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST" + }, + { + "type": "secret_base", + "x": 27, + "y": 27, + "elevation": 3, + "secret_base_id": "SECRET_BASE_RED_CAVE4_3" + }, + { + "type": "sign", + "x": 7, + "y": 84, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1180" + }, + { + "type": "secret_base", + "x": 14, + "y": 19, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_4" + }, + { + "type": "secret_base", + "x": 13, + "y": 19, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_1" + }, + { + "type": "hidden_item", + "x": 19, + "y": 55, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN" + }, + { + "type": "hidden_item", + "x": 35, + "y": 66, + "elevation": 0, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY" + }, + { + "type": "sign", + "x": 24, + "y": 116, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F146C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c89fcb3dc3..75de7dce74 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -97,7 +97,7 @@ Route111_EventScript_1F0E26:: @ 81F0E26 end Route111_EventScript_1F0E3C:: @ 81F0E3C - setmaplayoutindex 392 + setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER return Route111_EventScript_1F0E40:: @ 81F0E40 diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc deleted file mode 100644 index fbdd2e5ddd..0000000000 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route111_OldLadysRestStop_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 - -Route111_OldLadysRestStop_MapWarps: - warp_def 3, 7, 0, 2, MAP_ROUTE111 - warp_def 4, 7, 0, 2, MAP_ROUTE111 - -Route111_OldLadysRestStop_MapEvents:: - map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc deleted file mode 100644 index 9b2633050c..0000000000 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_OldLadysRestStop: - .4byte House3_Layout - .4byte Route111_OldLadysRestStop_MapEvents - .4byte Route111_OldLadysRestStop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json new file mode 100644 index 0000000000..d4e77fddac --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", + "name": "Route111_OldLadysRestStop", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_OldLadysRestStop_EventScript_22A920", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc deleted file mode 100644 index b433e1198e..0000000000 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route111_WinstrateFamilysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 - -Route111_WinstrateFamilysHouse_MapWarps: - warp_def 3, 7, 0, 0, MAP_ROUTE111 - warp_def 4, 7, 0, 0, MAP_ROUTE111 - -Route111_WinstrateFamilysHouse_MapEvents:: - map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc deleted file mode 100644 index d37a62e00a..0000000000 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_WinstrateFamilysHouse: - .4byte House2_Layout - .4byte Route111_WinstrateFamilysHouse_MapEvents - .4byte Route111_WinstrateFamilysHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json new file mode 100644 index 0000000000..d41cc1214a --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", + "name": "Route111_WinstrateFamilysHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc deleted file mode 100644 index 0fc8da215d..0000000000 --- a/data/maps/Route112/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route112_MapConnectionsList: - connection up, -60, MAP_ROUTE113 - connection left, 40, MAP_LAVARIDGE_TOWN - connection right, -20, MAP_ROUTE111 - -Route112_MapConnections: - .4byte 3 - .4byte Route112_MapConnectionsList - diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc deleted file mode 100644 index 4d1b338c3a..0000000000 --- a/data/maps/Route112/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -Route112_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 - -Route112_MapWarps: - warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 6, 46, 3, 0, MAP_JAGGED_PASS - warp_def 7, 46, 3, 1, MAP_JAGGED_PASS - warp_def 11, 36, 0, 0, MAP_FIERY_PATH - warp_def 22, 10, 0, 1, MAP_FIERY_PATH - -Route112_MapBGEvents: - bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F - bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 - bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 - -Route112_MapEvents:: - map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents - diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc deleted file mode 100644 index 1cc8583a5b..0000000000 --- a/data/maps/Route112/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112: - .4byte Route112_Layout - .4byte Route112_MapEvents - .4byte Route112_MapScripts - .4byte Route112_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE112 - .byte MAPSEC_ROUTE_112 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json new file mode 100644 index 0000000000..937719abff --- /dev/null +++ b/data/maps/Route112/map.json @@ -0,0 +1,287 @@ +{ + "id": "MAP_ROUTE112", + "name": "Route112", + "layout": "LAYOUT_ROUTE112", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_112", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -60, + "map": "MAP_ROUTE113" + }, + { + "direction": "left", + "offset": 40, + "map": "MAP_LAVARIDGE_TOWN" + }, + { + "direction": "right", + "offset": -20, + "map": "MAP_ROUTE111" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 26, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 24, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route112_EventScript_1F1E6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 22, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1E81", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 27, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 27, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 24, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 28, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 23, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 29, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 22, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 30, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 21, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 8, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1E61", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_290DCF", + "flag": "FLAG_ITEM_ROUTE_112_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 31, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F11", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 31, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F28", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 36, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 44, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E4F" + }, + { + "type": "sign", + "x": 22, + "y": 37, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E46" + }, + { + "type": "sign", + "x": 4, + "y": 49, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E58" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc deleted file mode 100644 index 4b51decda7..0000000000 --- a/data/maps/Route112_CableCarStation/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route112_CableCarStation_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - -Route112_CableCarStation_MapWarps: - warp_def 6, 11, 0, 0, MAP_ROUTE112 - warp_def 7, 11, 0, 1, MAP_ROUTE112 - -Route112_CableCarStation_MapEvents:: - map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc deleted file mode 100644 index f1a00b968d..0000000000 --- a/data/maps/Route112_CableCarStation/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112_CableCarStation: - .4byte CableCarStation_Layout - .4byte Route112_CableCarStation_MapEvents - .4byte Route112_CableCarStation_MapScripts - .4byte 0x0 - .2byte MUS_DOORO_X1 - .2byte LAYOUT_CABLE_CAR_STATION - .byte MAPSEC_ROUTE_112 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json new file mode 100644 index 0000000000..8552ec139a --- /dev/null +++ b/data/maps/Route112_CableCarStation/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE112_CABLE_CAR_STATION", + "name": "Route112_CableCarStation", + "layout": "LAYOUT_CABLE_CAR_STATION", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_112", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_CableCarStation_EventScript_22AB17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc deleted file mode 100644 index a4d583ce89..0000000000 --- a/data/maps/Route113/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route113_MapConnectionsList: - connection down, 60, MAP_ROUTE112 - connection left, 0, MAP_FALLARBOR_TOWN - connection right, 0, MAP_ROUTE111 - -Route113_MapConnections: - .4byte 3 - .4byte Route113_MapConnectionsList - diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc deleted file mode 100644 index bcf377e744..0000000000 --- a/data/maps/Route113/events.inc +++ /dev/null @@ -1,57 +0,0 @@ -Route113_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL - object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 - object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 - object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 - object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION - object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 - object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 - object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 - -Route113_MapWarps: - warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP - warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route113_MapCoordEvents: - coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 86, 9, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 85, 10, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 85, 11, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 8, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH - -Route113_MapBGEvents: - bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C - bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5 - bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 - bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE - bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER - bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 - bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET - -Route113_MapEvents:: - map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents - diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc deleted file mode 100644 index aae60a1002..0000000000 --- a/data/maps/Route113/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113: - .4byte Route113_Layout - .4byte Route113_MapEvents - .4byte Route113_MapScripts - .4byte Route113_MapConnections - .2byte MUS_KAZANBAI - .2byte LAYOUT_ROUTE113 - .byte MAPSEC_ROUTE_113 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json new file mode 100644 index 0000000000..7dc18e5724 --- /dev/null +++ b/data/maps/Route113/map.json @@ -0,0 +1,465 @@ +{ + "id": "MAP_ROUTE113", + "name": "Route113", + "layout": "LAYOUT_ROUTE113", + "music": "MUS_KAZANBAI", + "region_map_section": "MAPSEC_ROUTE_113", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 60, + "map": "MAP_ROUTE112" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_FALLARBOR_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE111" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 66, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_1F2193", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 36, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_1F218A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 62, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route113_EventScript_1F21C0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route113_EventScript_1F21D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 51, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route113_EventScript_1F21EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 53, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DDC", + "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 79, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DE9", + "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_HIDDEN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F2250", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 71, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_HIDDEN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22B2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 45, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22C9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 46, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22E4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DF6", + "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 75, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route113_EventScript_1F2344", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 71, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F232D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route113_EventScript_1F22FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route113_EventScript_1F2316", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 33, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE113_GLASS_WORKSHOP", + "dest_warp_id": 0 + }, + { + "x": 41, + "y": 12, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 88, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 19, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 86, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 85, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 85, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 14, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 11, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 19, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 6, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 7, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 85, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F219C" + }, + { + "type": "sign", + "x": 12, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21A5" + }, + { + "type": "sign", + "x": 58, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21B7" + }, + { + "type": "sign", + "x": 31, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21AE" + }, + { + "type": "secret_base", + "x": 49, + "y": 8, + "elevation": 3, + "secret_base_id": "SECRET_BASE_RED_CAVE1_3" + }, + { + "type": "hidden_item", + "x": 66, + "y": 3, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_ETHER" + }, + { + "type": "hidden_item", + "x": 22, + "y": 5, + "elevation": 3, + "item": "ITEM_TM32", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM_32" + }, + { + "type": "hidden_item", + "x": 73, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc deleted file mode 100644 index 7c8fbe7178..0000000000 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route113_GlassWorkshop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 - -Route113_GlassWorkshop_MapWarps: - warp_def 3, 8, 0, 0, MAP_ROUTE113 - warp_def 4, 8, 0, 0, MAP_ROUTE113 - -Route113_GlassWorkshop_MapEvents:: - map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc deleted file mode 100644 index e77f3acc81..0000000000 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113_GlassWorkshop: - .4byte House4_Layout - .4byte Route113_GlassWorkshop_MapEvents - .4byte Route113_GlassWorkshop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE4 - .byte MAPSEC_ROUTE_113 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json new file mode 100644 index 0000000000..185461fdb5 --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE113_GLASS_WORKSHOP", + "name": "Route113_GlassWorkshop", + "layout": "LAYOUT_HOUSE4", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_113", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_GlassWorkshop_EventScript_26ED1E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_GlassWorkshop_EventScript_26F194", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE113", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE113", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc deleted file mode 100644 index 5c7671c7c0..0000000000 --- a/data/maps/Route114/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route114_MapConnectionsList: - connection left, 40, MAP_ROUTE115 - connection right, 0, MAP_FALLARBOR_TOWN - -Route114_MapConnections: - .4byte 2 - .4byte Route114_MapConnectionsList - diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc deleted file mode 100644 index 9f17b54c03..0000000000 --- a/data/maps/Route114/events.inc +++ /dev/null @@ -1,53 +0,0 @@ -Route114_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, FLAG_ITEM_ROUTE_114_RARE_CANDY - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, FLAG_ITEM_ROUTE_114_PROTEIN - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_11 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 - object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_12 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_13 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_14 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_15 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 - -Route114_MapWarps: - warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R - warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE - warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route114_MapBGEvents: - bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 - bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E - bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 - bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 - bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 - bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 - bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 - bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 - bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637 - bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS - bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 - bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE - -Route114_MapEvents:: - map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents - diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc deleted file mode 100644 index 7177662e61..0000000000 --- a/data/maps/Route114/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114: - .4byte Route114_Layout - .4byte Route114_MapEvents - .4byte Route114_MapScripts - .4byte Route114_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE114 - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json new file mode 100644 index 0000000000..75f975eb69 --- /dev/null +++ b/data/maps/Route114/map.json @@ -0,0 +1,509 @@ +{ + "id": "MAP_ROUTE114", + "name": "Route114", + "layout": "LAYOUT_ROUTE114", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE115" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_FALLARBOR_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 77, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 78, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 65, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route114_EventScript_1F2640", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 30, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route114_EventScript_1F2657", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 22, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F266E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 19, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F2685", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 20, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F269C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 68, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E03", + "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 37, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E10", + "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 12, + "y": 43, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 19, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F25D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 19, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2612", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 27, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2582", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2777", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 19, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2760", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 30, + "y": 58, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F26FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 29, + "y": 53, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 30, + "y": 54, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 22, + "y": 69, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 11, + "y": 64, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 24, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route114_EventScript_1F27A9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 23, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route114_EventScript_1F278E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 28, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F27DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 26, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route114_EventScript_1F27C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E1D", + "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 28, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F27F2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 63, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 36, + "elevation": 0, + "dest_map": "MAP_ROUTE114_LANETTES_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 46, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 7, + "y": 64, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2625" + }, + { + "type": "sign", + "x": 31, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F262E" + }, + { + "type": "secret_base", + "x": 9, + "y": 47, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_1" + }, + { + "type": "secret_base", + "x": 30, + "y": 51, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_1" + }, + { + "type": "secret_base", + "x": 19, + "y": 70, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_2" + }, + { + "type": "secret_base", + "x": 12, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_2" + }, + { + "type": "sign", + "x": 25, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2637" + }, + { + "type": "hidden_item", + "x": 20, + "y": 57, + "elevation": 3, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS" + }, + { + "type": "secret_base", + "x": 32, + "y": 57, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 7, + "y": 30, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc deleted file mode 100644 index dd3be1a66a..0000000000 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route114_FossilManiacsHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 - -Route114_FossilManiacsHouse_MapWarps: - warp_def 4, 7, 0, 1, MAP_ROUTE114 - warp_def 5, 7, 0, 1, MAP_ROUTE114 - warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL - -Route114_FossilManiacsHouse_MapBGEvents: - bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C - bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C - -Route114_FossilManiacsHouse_MapEvents:: - map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents - diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc deleted file mode 100644 index 648359c8fe..0000000000 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsHouse: - .4byte Route114_FossilManiacsHouse_Layout - .4byte Route114_FossilManiacsHouse_MapEvents - .4byte Route114_FossilManiacsHouse_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json new file mode 100644 index 0000000000..c3c29bdd99 --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "name": "Route114_FossilManiacsHouse", + "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + }, + { + "type": "sign", + "x": 6, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + }, + { + "type": "sign", + "x": 7, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + }, + { + "type": "sign", + "x": 8, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc deleted file mode 100644 index ec9551959c..0000000000 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 - -Route114_FossilManiacsTunnel_MapWarps: - warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS - -Route114_FossilManiacsTunnel_MapCoordEvents: - coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 - coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 - -Route114_FossilManiacsTunnel_MapEvents:: - map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc deleted file mode 100644 index 9012e1d402..0000000000 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel: - .4byte Route114_FossilManiacsTunnel_Layout - .4byte Route114_FossilManiacsTunnel_MapEvents - .4byte Route114_FossilManiacsTunnel_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json new file mode 100644 index 0000000000..48b3ca7f49 --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "name": "Route114_FossilManiacsTunnel", + "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 25, + "elevation": 3, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 25, + "elevation": 3, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_DESERT_UNDERPASS", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_0x40CC", + "var_value": 1, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + }, + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x40CC", + "var_value": 1, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc deleted file mode 100644 index ccd0828514..0000000000 --- a/data/maps/Route114_LanettesHouse/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE - -Route114_LanettesHouse_MapWarps: - warp_def 5, 7, 0, 2, MAP_ROUTE114 - warp_def 6, 7, 0, 2, MAP_ROUTE114 - -Route114_LanettesHouse_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309 - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 - -Route114_LanettesHouse_MapEvents:: - map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents - diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc deleted file mode 100644 index 7b5b949636..0000000000 --- a/data/maps/Route114_LanettesHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse: - .4byte Route114_LanettesHouse_Layout - .4byte Route114_LanettesHouse_MapEvents - .4byte Route114_LanettesHouse_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_LANETTES_HOUSE - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json new file mode 100644 index 0000000000..5dbe09a09e --- /dev/null +++ b/data/maps/Route114_LanettesHouse/map.json @@ -0,0 +1,74 @@ +{ + "id": "MAP_ROUTE114_LANETTES_HOUSE", + "name": "Route114_LanettesHouse", + "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_LanettesHouse_EventScript_22B2D2", + "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B309" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B345" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B345" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc deleted file mode 100644 index a569fd0b57..0000000000 --- a/data/maps/Route115/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route115_MapConnectionsList: - connection down, 0, MAP_RUSTBORO_CITY - connection right, -40, MAP_ROUTE114 - -Route115_MapConnections: - .4byte 2 - .4byte Route115_MapConnectionsList - diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc deleted file mode 100644 index 517711bd5f..0000000000 --- a/data/maps/Route115/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -Route115_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, FLAG_ITEM_ROUTE_115_SUPER_POTION - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, FLAG_ITEM_ROUTE_115_TM_01 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, FLAG_ITEM_ROUTE_115_IRON - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, FLAG_ITEM_ROUTE_115_GREAT_BALL - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 - object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 - object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 - object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER - -Route115_MapWarps: - warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R - warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route115_MapBGEvents: - bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 - bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 - bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C - bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F2985 - bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 - bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 - bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 - bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3 - bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3 - bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4 - bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3 - bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3 - bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 - bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE - -Route115_MapEvents:: - map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents - diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc deleted file mode 100644 index fd3f9b2fc5..0000000000 --- a/data/maps/Route115/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route115: - .4byte Route115_Layout - .4byte Route115_MapEvents - .4byte Route115_MapScripts - .4byte Route115_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE115 - .byte MAPSEC_ROUTE_115 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json new file mode 100644 index 0000000000..58e5a602be --- /dev/null +++ b/data/maps/Route115/map.json @@ -0,0 +1,455 @@ +{ + "id": "MAP_ROUTE115", + "name": "Route115", + "layout": "LAYOUT_ROUTE115", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_115", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE114" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 18, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_1F2973", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route115_EventScript_1F298E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 27, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2A07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 69, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 70, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 71, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route115_EventScript_1F2A69", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 19, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route115_EventScript_1F29F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 24, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2ACB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E2A", + "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 18, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E37", + "flag": "FLAG_ITEM_ROUTE_115_TM_01" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E44", + "flag": "FLAG_ITEM_ROUTE_115_IRON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 64, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 55, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 65, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 56, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 29, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E51", + "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route115_EventScript_1F2AE2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 11, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route115_EventScript_1F2AF9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B27", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 28, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B3E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 67, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E6B", + "flag": "FLAG_ITEM_ROUTE_115_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E5E", + "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER" + } + ], + "warp_events": [ + { + "x": 27, + "y": 37, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 10, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 32, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_2" + }, + { + "type": "secret_base", + "x": 21, + "y": 18, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_2" + }, + { + "type": "sign", + "x": 16, + "y": 64, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route115_EventScript_1F297C" + }, + { + "type": "sign", + "x": 25, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route115_EventScript_1F2985" + }, + { + "type": "secret_base", + "x": 8, + "y": 30, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_3" + }, + { + "type": "secret_base", + "x": 32, + "y": 39, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_2" + }, + { + "type": "secret_base", + "x": 26, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_2" + }, + { + "type": "secret_base", + "x": 23, + "y": 8, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_3" + }, + { + "type": "secret_base", + "x": 32, + "y": 46, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_3" + }, + { + "type": "secret_base", + "x": 7, + "y": 20, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_4" + }, + { + "type": "secret_base", + "x": 8, + "y": 20, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_3" + }, + { + "type": "secret_base", + "x": 25, + "y": 24, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_3" + }, + { + "type": "secret_base", + "x": 20, + "y": 53, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_1" + }, + { + "type": "hidden_item", + "x": 15, + "y": 49, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc deleted file mode 100644 index bbf03097c2..0000000000 --- a/data/maps/Route116/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route116_MapConnectionsList: - connection down, 80, MAP_VERDANTURF_TOWN - connection left, 0, MAP_RUSTBORO_CITY - -Route116_MapConnections: - .4byte 2 - .4byte Route116_MapConnectionsList - diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc deleted file mode 100644 index 29566f515c..0000000000 --- a/data/maps/Route116/events.inc +++ /dev/null @@ -1,56 +0,0 @@ -Route116_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, FLAG_ITEM_ROUTE_116_ETHER - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, FLAG_ITEM_ROUTE_116_REPEL - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, FLAG_HIDE_ROUTE_116_MR_BRINEY - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_13 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_14 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, FLAG_ITEM_ROUTE_116_HP_UP - object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, FLAG_ITEM_ROUTE_116_X_SPECIAL - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, FLAG_HIDE_ROUTE_116_TUNNELER - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN - object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 - object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, FLAG_ITEM_ROUTE_116_POTION - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_15 - object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 - object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 - -Route116_MapWarps: - warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL - warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE - warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL - warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route116_MapCoordEvents: - coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 - -Route116_MapBGEvents: - bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57 - bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60 - bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69 - bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 - bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 - bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D72 - bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B - bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 - bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 - bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION - bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES - -Route116_MapEvents:: - map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents - diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc deleted file mode 100644 index d4688d63a9..0000000000 --- a/data/maps/Route116/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116: - .4byte Route116_Layout - .4byte Route116_MapEvents - .4byte Route116_MapScripts - .4byte Route116_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE116 - .byte MAPSEC_ROUTE_116 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json new file mode 100644 index 0000000000..7e76a9e638 --- /dev/null +++ b/data/maps/Route116/map.json @@ -0,0 +1,527 @@ +{ + "id": "MAP_ROUTE116", + "name": "Route116", + "layout": "LAYOUT_ROUTE116", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_116", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 80, + "map": "MAP_VERDANTURF_TOWN" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 25, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 19, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 26, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2E89", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 21, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 32, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F2EA0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E85", + "flag": "FLAG_ITEM_ROUTE_116_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E92", + "flag": "FLAG_ITEM_ROUTE_116_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 20, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 66, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 21, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 67, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 46, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2D84", + "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 28, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 36, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2F65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 80, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E9F", + "flag": "FLAG_ITEM_ROUTE_116_HP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 26, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F2F7C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 22, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2F93", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route116_EventScript_1F2EB7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 46, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2CA2", + "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 55, + "y": 12, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E78", + "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 38, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2C70", + "flag": "FLAG_HIDE_ROUTE_116_TUNNELER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 74, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2DB6", + "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route116_EventScript_1F3041", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F3058", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 34, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290EAC", + "flag": "FLAG_ITEM_ROUTE_116_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 36, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route116_EventScript_1F3086", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 42, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route116_EventScript_1F306F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 47, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 2 + }, + { + "x": 59, + "y": 13, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 79, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 47, + "y": 9, + "elevation": 3, + "var": "VAR_0x406F", + "var_value": 1, + "script": "Route116_EventScript_1F2D95" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D57" + }, + { + "type": "sign", + "x": 48, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D60" + }, + { + "type": "sign", + "x": 40, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D69" + }, + { + "type": "secret_base", + "x": 71, + "y": 4, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_1" + }, + { + "type": "secret_base", + "x": 79, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_1" + }, + { + "type": "sign", + "x": 16, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D72" + }, + { + "type": "sign", + "x": 29, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D7B" + }, + { + "type": "secret_base", + "x": 56, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_2" + }, + { + "type": "secret_base", + "x": 55, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_2" + }, + { + "type": "hidden_item", + "x": 22, + "y": 9, + "elevation": 3, + "item": "ITEM_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION" + }, + { + "type": "hidden_item", + "x": 70, + "y": 13, + "elevation": 3, + "item": "ITEM_BLACK_GLASSES", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc deleted file mode 100644 index 5ecd36317c..0000000000 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route116_TunnelersRestHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 - -Route116_TunnelersRestHouse_MapWarps: - warp_def 4, 8, 0, 1, MAP_ROUTE116 - warp_def 5, 8, 0, 1, MAP_ROUTE116 - -Route116_TunnelersRestHouse_MapEvents:: - map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc deleted file mode 100644 index f50a13c93d..0000000000 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_TunnelersRestHouse: - .4byte Route116_TunnelersRestHouse_Layout - .4byte Route116_TunnelersRestHouse_MapEvents - .4byte Route116_TunnelersRestHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE - .byte MAPSEC_ROUTE_116 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json new file mode 100644 index 0000000000..0301a32eec --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", + "name": "Route116_TunnelersRestHouse", + "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_116", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B85A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B86C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B863", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc deleted file mode 100644 index 101690881b..0000000000 --- a/data/maps/Route117/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route117_MapConnectionsList: - connection left, 0, MAP_VERDANTURF_TOWN - connection right, 0, MAP_MAUVILLE_CITY - -Route117_MapConnections: - .4byte 2 - .4byte Route117_MapConnectionsList - diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc deleted file mode 100644 index 217068cd39..0000000000 --- a/data/maps/Route117/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -Route117_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, FLAG_ITEM_ROUTE_117_GREAT_BALL - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, FLAG_ITEM_ROUTE_117_REVIVE - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 - object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 - -Route117_MapWarps: - warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE - -Route117_MapBGEvents: - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 - bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE - bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 - bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL - -Route117_MapEvents:: - map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents - diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc deleted file mode 100644 index 4ae1b92e55..0000000000 --- a/data/maps/Route117/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117: - .4byte Route117_Layout - .4byte Route117_MapEvents - .4byte Route117_MapScripts - .4byte Route117_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE117 - .byte MAPSEC_ROUTE_117 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json new file mode 100644 index 0000000000..ab9aa7b24a --- /dev/null +++ b/data/maps/Route117/map.json @@ -0,0 +1,385 @@ +{ + "id": "MAP_ROUTE117", + "name": "Route117", + "layout": "LAYOUT_ROUTE117", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_117", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_VERDANTURF_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 13, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F399A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 25, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F39A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 47, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_291C18", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 33, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 39, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 42, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 49, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 38, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 8, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3A94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route117_EventScript_1F3A32", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 33, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F39D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 41, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 29, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 42, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 28, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 43, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 27, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_290EB9", + "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_290EC6", + "flag": "FLAG_ITEM_ROUTE_117_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 26, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route117_EventScript_1F3AF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 17, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3B58", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 43, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route117_EventScript_1F3BD3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 42, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route117_EventScript_1F3B6F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 48, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F39AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 15, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C4E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 21, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 16, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C37", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 51, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE117_POKEMON_DAY_CARE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39B5" + }, + { + "type": "sign", + "x": 49, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39BE" + }, + { + "type": "sign", + "x": 49, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39C7" + }, + { + "type": "hidden_item", + "x": 3, + "y": 18, + "elevation": 3, + "item": "ITEM_REPEL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_117_REPEL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc deleted file mode 100644 index 6b5d2cc7ae..0000000000 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route117_PokemonDayCare_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 - -Route117_PokemonDayCare_MapWarps: - warp_def 2, 8, 0, 0, MAP_ROUTE117 - warp_def 3, 8, 0, 0, MAP_ROUTE117 - -Route117_PokemonDayCare_MapEvents:: - map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc deleted file mode 100644 index 827464a750..0000000000 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_PokemonDayCare: - .4byte Route117_PokemonDayCare_Layout - .4byte Route117_PokemonDayCare_MapEvents - .4byte Route117_PokemonDayCare_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE117_POKEMON_DAY_CARE - .byte MAPSEC_ROUTE_117 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json new file mode 100644 index 0000000000..a62485c74d --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE117_POKEMON_DAY_CARE", + "name": "Route117_PokemonDayCare", + "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_117", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_PokemonDayCare_EventScript_291D11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE117", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE117", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc deleted file mode 100644 index 54ecf15774..0000000000 --- a/data/maps/Route118/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route118_MapConnectionsList: - connection up, 40, MAP_ROUTE119 - connection left, 0, MAP_MAUVILLE_CITY - connection right, 0, MAP_ROUTE123 - -Route118_MapConnections: - .4byte 3 - .4byte Route118_MapConnectionsList - diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc deleted file mode 100644 index 3dea1c6f66..0000000000 --- a/data/maps/Route118/events.inc +++ /dev/null @@ -1,46 +0,0 @@ -Route118_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 - object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION - object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 - -Route118_MapWarps: - warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route118_MapCoordEvents: - coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E - coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE - coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4 - -Route118_MapBGEvents: - bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 - bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C - bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85 - bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 - bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 - bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 - bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON - bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE - -Route118_MapEvents:: - map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents - diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc deleted file mode 100644 index d38319d965..0000000000 --- a/data/maps/Route118/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route118: - .4byte Route118_Layout - .4byte Route118_MapEvents - .4byte Route118_MapScripts - .4byte Route118_MapConnections - .2byte MUS_ROUTE_118 - .2byte LAYOUT_ROUTE118 - .byte MAPSEC_ROUTE_118 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json new file mode 100644 index 0000000000..135e7eb742 --- /dev/null +++ b/data/maps/Route118/map.json @@ -0,0 +1,421 @@ +{ + "id": "MAP_ROUTE118", + "name": "Route118", + "layout": "LAYOUT_ROUTE118", + "music": "MUS_ROUTE_118", + "region_map_section": "MAPSEC_ROUTE_118", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 40, + "map": "MAP_ROUTE119" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE123" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 31, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 32, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 33, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 64, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4079", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CE16", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CE36", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F3E73", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CED6", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CEF6", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 38, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F3E14", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route118_EventScript_1F3F87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F4000", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 56, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4090", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 39, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route118_EventScript_1F3FE9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 17, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4017", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 44, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_118_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 69, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_290ED3", + "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route118_EventScript_1F40A7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 42, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 43, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3E8E" + }, + { + "type": "trigger", + "x": 44, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3EAE" + }, + { + "type": "trigger", + "x": 45, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3EC4" + } + ], + "bg_events": [ + { + "type": "secret_base", + "x": 47, + "y": 14, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE1_1" + }, + { + "type": "sign", + "x": 13, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route118_EventScript_1F3E7C" + }, + { + "type": "sign", + "x": 56, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route118_EventScript_1F3E85" + }, + { + "type": "secret_base", + "x": 67, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_1" + }, + { + "type": "secret_base", + "x": 29, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_2" + }, + { + "type": "secret_base", + "x": 47, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_3" + }, + { + "type": "secret_base", + "x": 46, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_1" + }, + { + "type": "hidden_item", + "x": 31, + "y": 13, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 14, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc deleted file mode 100644 index 067db34f13..0000000000 --- a/data/maps/Route119/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route119_MapConnectionsList: - connection down, -40, MAP_ROUTE118 - connection right, 0, MAP_FORTREE_CITY - -Route119_MapConnections: - .4byte 2 - .4byte Route119_MapConnectionsList - diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc deleted file mode 100644 index 9942a4c4f4..0000000000 --- a/data/maps/Route119/events.inc +++ /dev/null @@ -1,99 +0,0 @@ -Route119_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F479D, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F4810, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F4786, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1F4872, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0 - object_event 12, EVENT_OBJ_GFX_NINJA_BOY, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 - object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 - object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, FLAG_ITEM_ROUTE_119_SUPER_REPEL - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, FLAG_ITEM_ROUTE_119_ZINC - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, FLAG_ITEM_ROUTE_119_ELIXIR_1 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, FLAG_ITEM_ROUTE_119_LEAF_STONE - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, FLAG_ITEM_ROUTE_119_RARE_CANDY - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, FLAG_ITEM_ROUTE_119_HYPER_POTION_1 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, FLAG_ITEM_ROUTE_119_HYPER_POTION_2 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, FLAG_HIDE_ROUTE_119_KECLEON_1 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, FLAG_HIDE_ROUTE_119_KECLEON_2 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 - object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 - object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 - object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, FLAG_ITEM_ROUTE_119_NUGGET - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT - -Route119_MapWarps: - warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F - warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE - -Route119_MapCoordEvents: - coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472 - coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D - coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - -Route119_MapBGEvents: - bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D - bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774 - bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 - bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 - bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 - bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2 - bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1 - bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1 - bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3 - bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3 - bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM - bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL - bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3 - bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3 - bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3 - bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3 - bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 - bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL - bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER - bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 - -Route119_MapEvents:: - map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents - diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc deleted file mode 100644 index 0e3685b373..0000000000 --- a/data/maps/Route119/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119: - .4byte Route119_Layout - .4byte Route119_MapEvents - .4byte Route119_MapScripts - .4byte Route119_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE119 - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json new file mode 100644 index 0000000000..fd6c836b70 --- /dev/null +++ b/data/maps/Route119/map.json @@ -0,0 +1,920 @@ +{ + "id": "MAP_ROUTE119", + "name": "Route119", + "layout": "LAYOUT_ROUTE119", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": -40, + "map": "MAP_ROUTE118" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_FORTREE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 34, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 25, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 35, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 36, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 12, + "y": 123, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 26, + "y": 123, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47B4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 5, + "y": 125, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F479D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 74, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4810", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 28, + "y": 116, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F4786", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 35, + "y": 83, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_EventScript_1F4872", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 34, + "y": 122, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 17, + "y": 128, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F4902", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 19, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4919", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 10, + "y": 50, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F48D4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 8, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route119_EventScript_1F48EB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 25, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 121, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EE0", + "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 96, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EED", + "flag": "FLAG_ITEM_ROUTE_119_ZINC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EFA", + "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F07", + "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F14", + "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 117, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F21", + "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 33, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49A3", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 34, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49BA", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 17, + "y": 33, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 31, + "y": 109, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 8, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 83, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 9, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 84, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 29, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 85, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 30, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 86, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 19, + "y": 133, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F476B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F2E", + "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 35, + "y": 93, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4930", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 31, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_27231C", + "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 25, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_272329", + "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 13, + "y": 104, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F4947", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route119_EventScript_1F498C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 16, + "y": 52, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4975", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 32, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route119_EventScript_1F495E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_291399", + "flag": "FLAG_ITEM_ROUTE_119_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 24, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F3B", + "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 28, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_SCOTT" + } + ], + "warp_events": [ + { + "x": 6, + "y": 32, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "dest_warp_id": 0 + }, + { + "x": 33, + "y": 109, + "elevation": 0, + "dest_map": "MAP_ROUTE119_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 31, + "elevation": 0, + "var": "VAR_0x4072", + "var_value": 0, + "script": "Route119_EventScript_1F4472" + }, + { + "type": "trigger", + "x": 26, + "y": 31, + "elevation": 0, + "var": "VAR_0x4072", + "var_value": 0, + "script": "Route119_EventScript_1F447D" + }, + { + "type": "weather", + "x": 29, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 30, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 31, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 32, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 15, + "y": 133, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 16, + "y": 132, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 17, + "y": 131, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 18, + "y": 130, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 131, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 20, + "y": 132, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 21, + "y": 133, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 36, + "y": 6, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 36, + "y": 7, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 35, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 35, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 16, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 17, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 18, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 19, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 20, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 34, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 33, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F477D" + }, + { + "type": "sign", + "x": 27, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F4774" + }, + { + "type": "secret_base", + "x": 5, + "y": 2, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_1" + }, + { + "type": "secret_base", + "x": 4, + "y": 89, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_2" + }, + { + "type": "secret_base", + "x": 5, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB2_1" + }, + { + "type": "secret_base", + "x": 7, + "y": 101, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB2_2" + }, + { + "type": "secret_base", + "x": 34, + "y": 24, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB3_1" + }, + { + "type": "secret_base", + "x": 31, + "y": 73, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB4_1" + }, + { + "type": "secret_base", + "x": 16, + "y": 81, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_3" + }, + { + "type": "secret_base", + "x": 16, + "y": 28, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 17, + "y": 82, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM" + }, + { + "type": "hidden_item", + "x": 38, + "y": 63, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL" + }, + { + "type": "secret_base", + "x": 26, + "y": 81, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_3" + }, + { + "type": "secret_base", + "x": 19, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_3" + }, + { + "type": "secret_base", + "x": 18, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_3" + }, + { + "type": "secret_base", + "x": 4, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB3_3" + }, + { + "type": "secret_base", + "x": 6, + "y": 2, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB4_3" + }, + { + "type": "hidden_item", + "x": 26, + "y": 120, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 20, + "y": 29, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER" + }, + { + "type": "sign", + "x": 28, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F49E3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc deleted file mode 100644 index 152deabee0..0000000000 --- a/data/maps/Route119_House/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route119_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 - -Route119_House_MapWarps: - warp_def 3, 8, 0, 1, MAP_ROUTE119 - warp_def 4, 8, 0, 1, MAP_ROUTE119 - -Route119_House_MapEvents:: - map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc deleted file mode 100644 index d7bbbd5ffb..0000000000 --- a/data/maps/Route119_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_House: - .4byte House1_Layout - .4byte Route119_House_MapEvents - .4byte Route119_House_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json new file mode 100644 index 0000000000..fdfd19f78d --- /dev/null +++ b/data/maps/Route119_House/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_ROUTE119_HOUSE", + "name": "Route119_House", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_270966", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc deleted file mode 100644 index e8f3b93f80..0000000000 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -Route119_WeatherInstitute_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 - -Route119_WeatherInstitute_1F_MapWarps: - warp_def 9, 12, 0, 0, MAP_ROUTE119 - warp_def 10, 12, 0, 0, MAP_ROUTE119 - warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F - -Route119_WeatherInstitute_1F_MapBGEvents: - bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - -Route119_WeatherInstitute_1F_MapEvents:: - map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents - diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc deleted file mode 100644 index be2fe1617c..0000000000 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_1F: - .4byte Route119_WeatherInstitute_1F_Layout - .4byte Route119_WeatherInstitute_1F_MapEvents - .4byte Route119_WeatherInstitute_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json new file mode 100644 index 0000000000..9101e24951 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -0,0 +1,141 @@ +{ + "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "name": "Route119_WeatherInstitute_1F", + "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB29", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB40", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 1, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 0, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 0, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc deleted file mode 100644 index 7463848207..0000000000 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route119_WeatherInstitute_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA - -Route119_WeatherInstitute_2F_MapWarps: - warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F - -Route119_WeatherInstitute_2F_MapEvents:: - map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc deleted file mode 100644 index 8543b0ed8b..0000000000 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_2F: - .4byte Route119_WeatherInstitute_2F_Layout - .4byte Route119_WeatherInstitute_2F_MapEvents - .4byte Route119_WeatherInstitute_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json new file mode 100644 index 0000000000..a8a1ebf62f --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -0,0 +1,133 @@ +{ + "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", + "name": "Route119_WeatherInstitute_2F", + "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF96", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_2F_EventScript_27018B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 16, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 19, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF68", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + } + ], + "warp_events": [ + { + "x": 17, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc deleted file mode 100644 index 9dda2ecade..0000000000 --- a/data/maps/Route120/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route120_MapConnectionsList: - connection left, 0, MAP_FORTREE_CITY - connection right, 80, MAP_ROUTE121 - -Route120_MapConnections: - .4byte 2 - .4byte Route120_MapConnectionsList - diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc deleted file mode 100644 index d198dff3c7..0000000000 --- a/data/maps/Route120/events.inc +++ /dev/null @@ -1,90 +0,0 @@ -Route120_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0 - object_event 12, EVENT_OBJ_GFX_MAN_5, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, FLAG_ITEM_ROUTE_120_NUGGET - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_11 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, FLAG_ITEM_ROUTE_120_FULL_HEAL - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_HIDE_ROUTE_120_STEVEN - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12 - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 - object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, FLAG_HIDE_ROUTE_120_KECLEON_2 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, FLAG_HIDE_ROUTE_120_KECLEON_3 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, FLAG_HIDE_ROUTE_120_KECLEON_4 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, FLAG_HIDE_ROUTE_120_KECLEON_6 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, FLAG_HIDE_ROUTE_120_KECLEON_5 - object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 - object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE - -Route120_MapWarps: - warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB - warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB - -Route120_MapCoordEvents: - coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS - -Route120_MapBGEvents: - bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5 - bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE - bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 - bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 - bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 - bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2 - bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3 - bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3 - bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3 - bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 - bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE - bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 - bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC - bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 - -Route120_MapEvents:: - map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents - diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc deleted file mode 100644 index 4d48d8b334..0000000000 --- a/data/maps/Route120/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route120: - .4byte Route120_Layout - .4byte Route120_MapEvents - .4byte Route120_MapScripts - .4byte Route120_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE120 - .byte MAPSEC_ROUTE_120 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json new file mode 100644 index 0000000000..db93042de7 --- /dev/null +++ b/data/maps/Route120/map.json @@ -0,0 +1,858 @@ +{ + "id": "MAP_ROUTE120", + "name": "Route120", + "layout": "LAYOUT_ROUTE120", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_120", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_FORTREE_CITY" + }, + { + "direction": "right", + "offset": 80, + "map": "MAP_ROUTE121" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 4, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 46, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 5, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 45, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 6, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 44, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 7, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 43, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 34, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 37, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 38, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 39, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 9, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 40, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 10, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 41, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 42, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 5, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F57D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 32, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F57EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 27, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route120_EventScript_1F5850", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 36, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route120_EventScript_1F5867", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 19, + "y": 80, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F587E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F48", + "flag": "FLAG_ITEM_ROUTE_120_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CE76", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CE56", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 35, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 89, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F55", + "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F5527", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 31, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F58E0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 9, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F58F7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 16, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F590E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 18, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5925", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F6F", + "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 82, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F62", + "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 12, + "y": 16, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F57BC", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 13, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F5641", + "flag": "FLAG_HIDE_ROUTE_120_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 20, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 15, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 10, + "y": 72, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F593C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 19, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5953", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 20, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722DB", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 27, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722E8", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 4, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722F5", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 7, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_27230F", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 19, + "y": 48, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_272302", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 19, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5981", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F596A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 24, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F7C", + "flag": "FLAG_ITEM_ROUTE_120_REVIVE" + } + ], + "warp_events": [ + { + "x": 7, + "y": 55, + "elevation": 0, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 23, + "elevation": 1, + "dest_map": "MAP_SCORCHED_SLAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 7, + "y": 15, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 7, + "y": 16, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 22, + "y": 61, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 12, + "y": 64, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 35, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 36, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 37, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 38, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 88, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 28, + "y": 15, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 28, + "y": 16, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 28, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 32, + "y": 89, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 90, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 91, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 10, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 11, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 12, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 13, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 27, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route120_EventScript_1F57C5" + }, + { + "type": "sign", + "x": 38, + "y": 88, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route120_EventScript_1F57CE" + }, + { + "type": "secret_base", + "x": 28, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_1" + }, + { + "type": "secret_base", + "x": 30, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_1" + }, + { + "type": "secret_base", + "x": 26, + "y": 10, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB3_2" + }, + { + "type": "secret_base", + "x": 29, + "y": 85, + "elevation": 5, + "secret_base_id": "SECRET_BASE_SHRUB4_2" + }, + { + "type": "secret_base", + "x": 18, + "y": 12, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_3" + }, + { + "type": "secret_base", + "x": 38, + "y": 54, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_3" + }, + { + "type": "secret_base", + "x": 31, + "y": 23, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB2_3" + }, + { + "type": "hidden_item", + "x": 9, + "y": 1, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1" + }, + { + "type": "hidden_item", + "x": 31, + "y": 11, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE" + }, + { + "type": "hidden_item", + "x": 0, + "y": 86, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2" + }, + { + "type": "hidden_item", + "x": 24, + "y": 42, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_ZINC" + }, + { + "type": "secret_base", + "x": 5, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_4" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc deleted file mode 100644 index 6d9bd9ae4b..0000000000 --- a/data/maps/Route121/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route121_MapConnectionsList: - connection down, 20, MAP_ROUTE122 - connection left, -80, MAP_ROUTE120 - connection right, -10, MAP_LILYCOVE_CITY - -Route121_MapConnections: - .4byte 3 - .4byte Route121_MapConnectionsList - diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc deleted file mode 100644 index 5e637bb7e7..0000000000 --- a/data/maps/Route121/events.inc +++ /dev/null @@ -1,55 +0,0 @@ -Route121_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_ITEM_ROUTE_121_CARBOS - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13 - object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 - object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 - object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 - object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC - -Route121_MapWarps: - warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -Route121_MapCoordEvents: - coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - -Route121_MapBGEvents: - bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 - bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 - bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 - bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 - bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 - bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP - bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET - bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL - bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE - -Route121_MapEvents:: - map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents - diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc deleted file mode 100644 index 04cee69427..0000000000 --- a/data/maps/Route121/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121: - .4byte Route121_Layout - .4byte Route121_MapEvents - .4byte Route121_MapScripts - .4byte Route121_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE121 - .byte MAPSEC_ROUTE_121 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json new file mode 100644 index 0000000000..82b7139a3b --- /dev/null +++ b/data/maps/Route121/map.json @@ -0,0 +1,536 @@ +{ + "id": "MAP_ROUTE121", + "name": "Route121", + "layout": "LAYOUT_ROUTE121", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_121", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 20, + "map": "MAP_ROUTE122" + }, + { + "direction": "left", + "offset": -80, + "map": "MAP_ROUTE120" + }, + { + "direction": "right", + "offset": -10, + "map": "MAP_LILYCOVE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 29, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_1F5DFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 47, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 48, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 49, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 50, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 64, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 51, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 65, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 52, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 66, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 53, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 67, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 54, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 39, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route121_EventScript_1F5F04", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 40, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route121_EventScript_1F5F1F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 31, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 65, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 63, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5E74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 55, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route121_EventScript_1F5E8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5EED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5F3A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 55, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290F89", + "flag": "FLAG_ITEM_ROUTE_121_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 26, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route121_EventScript_1F5F9C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 59, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5FB3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 59, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5FCA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 65, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route121_EventScript_1F5FE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 72, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route121_EventScript_1F5FF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 60, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290F96", + "flag": "FLAG_ITEM_ROUTE_121_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290FA3", + "flag": "FLAG_ITEM_ROUTE_121_ZINC" + } + ], + "warp_events": [ + { + "x": 37, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 5, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 6, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 7, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 8, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_EventScript_1F5E06" + }, + { + "type": "secret_base", + "x": 40, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_2" + }, + { + "type": "secret_base", + "x": 18, + "y": 13, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_2" + }, + { + "type": "secret_base", + "x": 43, + "y": 7, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_2" + }, + { + "type": "secret_base", + "x": 42, + "y": 7, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_2" + }, + { + "type": "sign", + "x": 39, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_EventScript_1F5E0F" + }, + { + "type": "hidden_item", + "x": 23, + "y": 10, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP" + }, + { + "type": "hidden_item", + "x": 58, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET" + }, + { + "type": "hidden_item", + "x": 72, + "y": 5, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 68, + "y": 8, + "elevation": 3, + "item": "ITEM_MAX_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc deleted file mode 100644 index 73c836cff7..0000000000 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route121_SafariZoneEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - -Route121_SafariZoneEntrance_MapWarps: - warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH - warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH - warp_def 14, 13, 0, 0, MAP_ROUTE121 - warp_def 15, 13, 0, 0, MAP_ROUTE121 - -Route121_SafariZoneEntrance_MapCoordEvents: - coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 - -Route121_SafariZoneEntrance_MapBGEvents: - bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 - -Route121_SafariZoneEntrance_MapEvents:: - map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents - diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc deleted file mode 100644 index b23cdecccc..0000000000 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_SafariZoneEntrance: - .4byte Route121_SafariZoneEntrance_Layout - .4byte Route121_SafariZoneEntrance_MapEvents - .4byte Route121_SafariZoneEntrance_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE - .byte MAPSEC_ROUTE_121 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json new file mode 100644 index 0000000000..878798477e --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "name": "Route121_SafariZoneEntrance", + "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_ROUTE_121", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 17, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BBE6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BBEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTH", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTH", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE121", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE121", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BC18" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_SafariZoneEntrance_EventScript_22BD21" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc deleted file mode 100644 index a5a9f4fd66..0000000000 --- a/data/maps/Route122/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route122_MapConnectionsList: - connection up, -20, MAP_ROUTE121 - connection down, -100, MAP_ROUTE123 - -Route122_MapConnections: - .4byte 2 - .4byte Route122_MapConnectionsList - diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc deleted file mode 100644 index 8eb4dbb2c8..0000000000 --- a/data/maps/Route122/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Route122_MapWarps: - warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F - -Route122_MapEvents:: - map_events 0x0, Route122_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc deleted file mode 100644 index 941fff7a36..0000000000 --- a/data/maps/Route122/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route122: - .4byte Route122_Layout - .4byte Route122_MapEvents - .4byte Route122_MapScripts - .4byte Route122_MapConnections - .2byte MUS_DOORO_X4 - .2byte LAYOUT_ROUTE122 - .byte MAPSEC_ROUTE_122 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json new file mode 100644 index 0000000000..9dee984d92 --- /dev/null +++ b/data/maps/Route122/map.json @@ -0,0 +1,39 @@ +{ + "id": "MAP_ROUTE122", + "name": "Route122", + "layout": "LAYOUT_ROUTE122", + "music": "MUS_DOORO_X4", + "region_map_section": "MAPSEC_ROUTE_122", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -20, + "map": "MAP_ROUTE121" + }, + { + "direction": "down", + "offset": -100, + "map": "MAP_ROUTE123" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 29, + "elevation": 0, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc deleted file mode 100644 index e2125c9117..0000000000 --- a/data/maps/Route123/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route123_MapConnectionsList: - connection up, 100, MAP_ROUTE122 - connection left, 0, MAP_ROUTE118 - -Route123_MapConnections: - .4byte 2 - .4byte Route123_MapConnectionsList - diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc deleted file mode 100644 index 2584ebbd36..0000000000 --- a/data/maps/Route123/events.inc +++ /dev/null @@ -1,88 +0,0 @@ -Route123_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_11 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_12 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_13 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, FLAG_ITEM_ROUTE_123_CALCIUM - object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 - object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 - object_event 27, EVENT_OBJ_GFX_TWIN, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 - object_event 28, EVENT_OBJ_GFX_TWIN, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0 - object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 - object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 - object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, FLAG_ITEM_ROUTE_123_ULTRA_BALL - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, FLAG_ITEM_ROUTE_123_ELIXIR - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 - object_event 35, EVENT_OBJ_GFX_WOMAN_2, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 - object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 - object_event 37, EVENT_OBJ_GFX_MAN_5, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 - object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 - object_event 39, EVENT_OBJ_GFX_EXPERT_M, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, FLAG_ITEM_ROUTE_123_PP_UP - object_event 41, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 - object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB - -Route123_MapWarps: - warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE - -Route123_MapCoordEvents: - coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - -Route123_MapBGEvents: - bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3 - bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 - bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 - bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA - bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL - bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC - bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 - bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE - bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION - bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP - bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY - -Route123_MapEvents:: - map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents - diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc deleted file mode 100644 index 2a0120cfd9..0000000000 --- a/data/maps/Route123/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123: - .4byte Route123_Layout - .4byte Route123_MapEvents - .4byte Route123_MapScripts - .4byte Route123_MapConnections - .2byte MUS_DOORO_X4 - .2byte LAYOUT_ROUTE123 - .byte MAPSEC_ROUTE_123 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json new file mode 100644 index 0000000000..d5a99b75c5 --- /dev/null +++ b/data/maps/Route123/map.json @@ -0,0 +1,840 @@ +{ + "id": "MAP_ROUTE123", + "name": "Route123", + "layout": "LAYOUT_ROUTE123", + "music": "MUS_DOORO_X4", + "region_map_section": "MAPSEC_ROUTE_123", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 100, + "map": "MAP_ROUTE122" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE118" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 58, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 59, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 60, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 61, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 81, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 62, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 82, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 63, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 83, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 64, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 70, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F61C5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 58, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F61DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 65, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 72, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 73, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 74, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 79, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 14, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 15, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 30, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 101, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 129, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 92, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FB0", + "flag": "FLAG_ITEM_ROUTE_123_CALCIUM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 108, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_1F6151", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 109, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 87, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 110, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 88, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 111, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 89, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 18, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F61F3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F62E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 37, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F62CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 138, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route123_EventScript_1F620A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 49, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F626C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 87, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route123_EventScript_1F6304", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FBD", + "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 75, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FCA", + "flag": "FLAG_ITEM_ROUTE_123_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 138, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F6377", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 138, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F6360", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 87, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route123_EventScript_1F6349", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 66, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F63BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 66, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F6332", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 49, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F631B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 43, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FD7", + "flag": "FLAG_ITEM_ROUTE_123_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route123_EventScript_1F638E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route123_EventScript_1F63A5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 57, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FE4", + "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB" + } + ], + "warp_events": [ + { + "x": 22, + "y": 6, + "elevation": 0, + "dest_map": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 90, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 92, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 93, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 92, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 91, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 34, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 108, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 109, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 110, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 111, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 112, + "y": 18, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 117, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61B3" + }, + { + "type": "secret_base", + "x": 47, + "y": 3, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_2" + }, + { + "type": "secret_base", + "x": 49, + "y": 3, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_2" + }, + { + "type": "sign", + "x": 10, + "y": 12, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61AA" + }, + { + "type": "hidden_item", + "x": 75, + "y": 1, + "elevation": 3, + "item": "ITEM_SUPER_REPEL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL" + }, + { + "type": "sign", + "x": 20, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61BC" + }, + { + "type": "secret_base", + "x": 57, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_3" + }, + { + "type": "hidden_item", + "x": 12, + "y": 1, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE" + }, + { + "type": "hidden_item", + "x": 91, + "y": 15, + "elevation": 3, + "item": "ITEM_HYPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION" + }, + { + "type": "hidden_item", + "x": 139, + "y": 15, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP" + }, + { + "type": "hidden_item", + "x": 138, + "y": 18, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc deleted file mode 100644 index 4ad6c2b634..0000000000 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route123_BerryMastersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 - -Route123_BerryMastersHouse_MapWarps: - warp_def 3, 7, 0, 0, MAP_ROUTE123 - warp_def 4, 7, 0, 0, MAP_ROUTE123 - -Route123_BerryMastersHouse_MapEvents:: - map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc deleted file mode 100644 index 158471eaab..0000000000 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123_BerryMastersHouse: - .4byte House2_Layout - .4byte Route123_BerryMastersHouse_MapEvents - .4byte Route123_BerryMastersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_ROUTE_123 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json new file mode 100644 index 0000000000..47ad26314b --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", + "name": "Route123_BerryMastersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_123", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_BerryMastersHouse_EventScript_26F845", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_BerryMastersHouse_EventScript_26F8C0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE123", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE123", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc deleted file mode 100644 index 959719385c..0000000000 --- a/data/maps/Route124/connections.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route124_MapConnectionsList: - connection down, 0, MAP_ROUTE126 - connection left, 10, MAP_LILYCOVE_CITY - connection right, 0, MAP_ROUTE125 - connection right, 40, MAP_MOSSDEEP_CITY - connection dive, 0, MAP_UNDERWATER1 - -Route124_MapConnections: - .4byte 5 - .4byte Route124_MapConnectionsList - diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc deleted file mode 100644 index 4096396e89..0000000000 --- a/data/maps/Route124/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route124_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 - -Route124_MapWarps: - warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - -Route124_MapBGEvents: - bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C - -Route124_MapEvents:: - map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents - diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc deleted file mode 100644 index 189d0dc516..0000000000 --- a/data/maps/Route124/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124: - .4byte Route124_Layout - .4byte Route124_MapEvents - .4byte Route124_MapScripts - .4byte Route124_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE124 - .byte MAPSEC_ROUTE_124 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json new file mode 100644 index 0000000000..1f3ef4f6c2 --- /dev/null +++ b/data/maps/Route124/map.json @@ -0,0 +1,220 @@ +{ + "id": "MAP_ROUTE124", + "name": "Route124", + "layout": "LAYOUT_ROUTE124", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_124", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE126" + }, + { + "direction": "left", + "offset": 10, + "map": "MAP_LILYCOVE_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE125" + }, + { + "direction": "right", + "offset": 40, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER1" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 34, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F6585", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 61, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F659C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 49, + "y": 45, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F65B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 7, + "y": 23, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 8, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F6615", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 58, + "y": 58, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 7, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route124_EventScript_1F662C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 28, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FF1", + "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FFE", + "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 58, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_29100B", + "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 18, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F6643", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 17, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F66A7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F670B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 69, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F6722", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 70, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 73, + "y": 48, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route124_EventScript_1F657C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc deleted file mode 100644 index 4cff6a1f3f..0000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route124_DivingTreasureHuntersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps: - warp_def 3, 8, 0, 0, MAP_ROUTE124 - warp_def 4, 8, 0, 0, MAP_ROUTE124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents: - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 - -Route124_DivingTreasureHuntersHouse_MapEvents:: - map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents - diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc deleted file mode 100644 index 46358f3374..0000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_DivingTreasureHuntersHouse: - .4byte Route124_DivingTreasureHuntersHouse_Layout - .4byte Route124_DivingTreasureHuntersHouse_MapEvents - .4byte Route124_DivingTreasureHuntersHouse_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - .byte MAPSEC_ROUTE_124 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json new file mode 100644 index 0000000000..ed159e565b --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "name": "Route124_DivingTreasureHuntersHouse", + "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_ROUTE_124", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE124", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE124", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route124_DivingTreasureHuntersHouse_EventScript_270F63" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc deleted file mode 100644 index 61ea9f0296..0000000000 --- a/data/maps/Route125/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route125_MapConnectionsList: - connection down, 0, MAP_MOSSDEEP_CITY - connection left, 0, MAP_ROUTE124 - connection dive, 0, MAP_UNDERWATER7 - -Route125_MapConnections: - .4byte 3 - .4byte Route125_MapConnectionsList - diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc deleted file mode 100644 index e278d6e241..0000000000 --- a/data/maps/Route125/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route125_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL - -Route125_MapWarps: - warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - -Route125_MapBGEvents: - bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 - bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 - bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 - bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 - -Route125_MapEvents:: - map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents - diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc deleted file mode 100644 index b3a7308f31..0000000000 --- a/data/maps/Route125/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route125: - .4byte Route125_Layout - .4byte Route125_MapEvents - .4byte Route125_MapScripts - .4byte Route125_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE125 - .byte MAPSEC_ROUTE_125 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json new file mode 100644 index 0000000000..55f9b692dc --- /dev/null +++ b/data/maps/Route125/map.json @@ -0,0 +1,204 @@ +{ + "id": "MAP_ROUTE125", + "name": "Route125", + "layout": "LAYOUT_ROUTE125", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_125", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE124" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER7" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 31, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F67A4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 45, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F67BB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 38, + "y": 24, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F67D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 30, + "y": 28, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 9, + "movement_range_y": 9, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F67E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 21, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F6800", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 17, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route125_EventScript_1F6862", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 18, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route125_EventScript_1F687D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 43, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F6898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 48, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F68AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 46, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route125_EventScript_291018", + "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL" + } + ], + "warp_events": [ + { + "x": 22, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 53, + "y": 10, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE1_2" + }, + { + "type": "secret_base", + "x": 55, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE4_2" + }, + { + "type": "secret_base", + "x": 7, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_2" + }, + { + "type": "secret_base", + "x": 24, + "y": 32, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc deleted file mode 100644 index 5784faa258..0000000000 --- a/data/maps/Route126/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route126_MapConnectionsList: - connection up, 0, MAP_ROUTE124 - connection right, 0, MAP_ROUTE127 - connection dive, 0, MAP_UNDERWATER2 - -Route126_MapConnections: - .4byte 3 - .4byte Route126_MapConnectionsList - diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc deleted file mode 100644 index 04355d668f..0000000000 --- a/data/maps/Route126/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route126_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD - object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 - -Route126_MapEvents:: - map_events Route126_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc deleted file mode 100644 index f0eabeeba4..0000000000 --- a/data/maps/Route126/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route126: - .4byte Route126_Layout - .4byte Route126_MapEvents - .4byte Route126_MapScripts - .4byte Route126_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE126 - .byte MAPSEC_ROUTE_126 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json new file mode 100644 index 0000000000..8ccd3c3658 --- /dev/null +++ b/data/maps/Route126/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_ROUTE126", + "name": "Route126", + "layout": "LAYOUT_ROUTE126", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_126", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE124" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER2" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 51, + "y": 65, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 10, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F68D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 56, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 9, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F68ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 63, + "y": 43, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F6904", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 9, + "y": 48, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F691B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route126_EventScript_291025", + "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 15, + "y": 66, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6960", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 66, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6977", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 64, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6949", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 56, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6932", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc deleted file mode 100644 index 8dcdf7978a..0000000000 --- a/data/maps/Route127/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route127_MapConnectionsList: - connection up, 0, MAP_MOSSDEEP_CITY - connection down, 0, MAP_ROUTE128 - connection left, 0, MAP_ROUTE126 - connection dive, 0, MAP_UNDERWATER3 - -Route127_MapConnections: - .4byte 4 - .4byte Route127_MapConnectionsList - diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc deleted file mode 100644 index 7b9e040d30..0000000000 --- a/data/maps/Route127/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route127_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY - -Route127_MapBGEvents: - bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 - bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 - bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 - bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 - bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 - -Route127_MapEvents:: - map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents - diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc deleted file mode 100644 index 0a7055f1c5..0000000000 --- a/data/maps/Route127/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route127: - .4byte Route127_Layout - .4byte Route127_MapEvents - .4byte Route127_MapScripts - .4byte Route127_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE127 - .byte MAPSEC_ROUTE_127 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json new file mode 100644 index 0000000000..06fd540d20 --- /dev/null +++ b/data/maps/Route127/map.json @@ -0,0 +1,221 @@ +{ + "id": "MAP_ROUTE127", + "name": "Route127", + "layout": "LAYOUT_ROUTE127", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_127", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE128" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE126" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER3" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 45, + "y": 42, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6A35", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 18, + "y": 68, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route127_EventScript_1F6A4C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_291032", + "flag": "FLAG_ITEM_ROUTE_127_ZINC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 64, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_29103F", + "flag": "FLAG_ITEM_ROUTE_127_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 42, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A63", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 64, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A91", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 54, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 15, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6AA8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 63, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route127_EventScript_1F6AD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 12, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6ABF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_29104C", + "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 59, + "y": 67, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE4_1" + }, + { + "type": "secret_base", + "x": 59, + "y": 72, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_2" + }, + { + "type": "secret_base", + "x": 67, + "y": 63, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_1" + }, + { + "type": "secret_base", + "x": 61, + "y": 21, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_3" + }, + { + "type": "secret_base", + "x": 45, + "y": 24, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc deleted file mode 100644 index b958dbd3b7..0000000000 --- a/data/maps/Route128/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route128_MapConnectionsList: - connection up, 0, MAP_ROUTE127 - connection down, 0, MAP_ROUTE129 - connection right, -40, MAP_EVER_GRANDE_CITY - connection dive, 0, MAP_UNDERWATER4 - -Route128_MapConnections: - .4byte 4 - .4byte Route128_MapConnectionsList - diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc deleted file mode 100644 index 6a449b7614..0000000000 --- a/data/maps/Route128/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route128_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_ARCHIE - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_MAXIE - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 - -Route128_MapBGEvents: - bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 - bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 - bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 - -Route128_MapEvents:: - map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents - diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc deleted file mode 100644 index 33894ba7c1..0000000000 --- a/data/maps/Route128/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route128: - .4byte Route128_Layout - .4byte Route128_MapEvents - .4byte Route128_MapScripts - .4byte Route128_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE128 - .byte MAPSEC_ROUTE_128 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json new file mode 100644 index 0000000000..b1d63ef636 --- /dev/null +++ b/data/maps/Route128/map.json @@ -0,0 +1,197 @@ +{ + "id": "MAP_ROUTE128", + "name": "Route128", + "layout": "LAYOUT_ROUTE128", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_128", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE129" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_EVER_GRANDE_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER4" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 35, + "y": 33, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN", + "movement_range_x": 5, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6CBE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 78, + "y": 24, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route128_EventScript_1F6D20", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 40, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 37, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 38, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 63, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route128_EventScript_1F6DB0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 47, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6D99", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 24, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6D82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 101, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route128_EventScript_1F6DDE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 101, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route128_EventScript_1F6DC7", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 49, + "y": 9, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 57, + "y": 21, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2" + }, + { + "type": "hidden_item", + "x": 31, + "y": 33, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc deleted file mode 100644 index c486c13cb0..0000000000 --- a/data/maps/Route129/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route129_MapConnectionsList: - connection up, 0, MAP_ROUTE128 - connection left, 0, MAP_ROUTE130 - connection dive, 0, MAP_UNDERWATER5 - -Route129_MapConnections: - .4byte 3 - .4byte Route129_MapConnectionsList - diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc deleted file mode 100644 index 3919274cd6..0000000000 --- a/data/maps/Route129/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route129_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 - -Route129_MapEvents:: - map_events Route129_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc deleted file mode 100644 index fd3cae8014..0000000000 --- a/data/maps/Route129/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route129: - .4byte Route129_Layout - .4byte Route129_MapEvents - .4byte Route129_MapScripts - .4byte Route129_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE129 - .byte MAPSEC_ROUTE_129 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json new file mode 100644 index 0000000000..310a3e06a8 --- /dev/null +++ b/data/maps/Route129/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_ROUTE129", + "name": "Route129", + "layout": "LAYOUT_ROUTE129", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_129", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE128" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE130" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER5" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 28, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 3, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route129_EventScript_1F72EC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 14, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 5, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route129_EventScript_1F7303", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 13, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route129_EventScript_1F7331", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 35, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route129_EventScript_1F731A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 13, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route129_EventScript_1F7348", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc deleted file mode 100644 index 4300eaae4e..0000000000 --- a/data/maps/Route130/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route130_MapConnectionsList: - connection left, 0, MAP_ROUTE131 - connection right, 0, MAP_ROUTE129 - -Route130_MapConnections: - .4byte 2 - .4byte Route130_MapConnectionsList - diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc deleted file mode 100644 index b07cc10017..0000000000 --- a/data/maps/Route130/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route130_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 - -Route130_MapEvents:: - map_events Route130_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc deleted file mode 100644 index 5afd25edaf..0000000000 --- a/data/maps/Route130/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route130: - .4byte Route130_Layout - .4byte Route130_MapEvents - .4byte Route130_MapScripts - .4byte Route130_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE130 - .byte MAPSEC_ROUTE_130 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json new file mode 100644 index 0000000000..d9797e5cc1 --- /dev/null +++ b/data/maps/Route130/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_ROUTE130", + "name": "Route130", + "layout": "LAYOUT_ROUTE130", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_130", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE131" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 70, + "y": 21, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 3, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route130_EventScript_1F73BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 7, + "y": 21, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route130_EventScript_1F73D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 52, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 82, + "script": "BerryTreeScript", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 30, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route130_EventScript_1F73ED", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 5c7696eb78..819d9e4f3c 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -23,11 +23,11 @@ Route130_MapScript1_1F7365: @ 81F7365 setflag FLAG_TEMP_1D setflag FLAG_TEMP_1E setflag FLAG_TEMP_1F - setmaplayoutindex 263 + setmaplayoutindex LAYOUT_ROUTE130 end Route130_EventScript_1F73B1:: @ 81F73B1 - setmaplayoutindex 46 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4 end Route130_EventScript_1F73B5:: @ 81F73B5 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc deleted file mode 100644 index 9697ba1e0d..0000000000 --- a/data/maps/Route131/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route131_MapConnectionsList: - connection left, 0, MAP_PACIFIDLOG_TOWN - connection right, 0, MAP_ROUTE130 - -Route131_MapConnections: - .4byte 2 - .4byte Route131_MapConnectionsList - diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc deleted file mode 100644 index 4f57f7b1c6..0000000000 --- a/data/maps/Route131/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route131_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 3, 5, 1, 3, Route131_EventScript_1F746E, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F7485, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 - -Route131_MapWarps: - warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE - -Route131_MapEvents:: - map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc deleted file mode 100644 index 177dba5ab7..0000000000 --- a/data/maps/Route131/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route131: - .4byte Route131_Layout - .4byte Route131_MapEvents - .4byte Route131_MapScripts - .4byte Route131_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE131 - .byte MAPSEC_ROUTE_131 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json new file mode 100644 index 0000000000..f8d56cc35b --- /dev/null +++ b/data/maps/Route131/map.json @@ -0,0 +1,144 @@ +{ + "id": "MAP_ROUTE131", + "name": "Route131", + "layout": "LAYOUT_ROUTE131", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_131", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_PACIFIDLOG_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE130" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 41, + "y": 32, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN", + "movement_range_x": 5, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route131_EventScript_1F7429", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 18, + "y": 19, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route131_EventScript_1F7440", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route131_EventScript_1F7457", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 31, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", + "movement_range_x": 3, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route131_EventScript_1F746E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 9, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route131_EventScript_1F7485", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 8, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route131_EventScript_1F74A0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 52, + "y": 20, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route131_EventScript_1F74D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 52, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route131_EventScript_1F74BB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 36, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index da36f4001d..700ac25f6a 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A end Route131_EventScript_1F741B:: @ 81F741B - setmaplayoutindex 319 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470 return Route131_EventScript_1F741F:: @ 81F741F diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc deleted file mode 100644 index 48999eb5c9..0000000000 --- a/data/maps/Route132/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route132_MapConnectionsList: - connection left, 0, MAP_ROUTE133 - connection right, 0, MAP_PACIFIDLOG_TOWN - -Route132_MapConnections: - .4byte 2 - .4byte Route132_MapConnectionsList - diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc deleted file mode 100644 index 8ced112056..0000000000 --- a/data/maps/Route132/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 - object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN - -Route132_MapEvents:: - map_events Route132_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc deleted file mode 100644 index 06e0ac05d1..0000000000 --- a/data/maps/Route132/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132: - .4byte Route132_Layout - .4byte Route132_MapEvents - .4byte Route132_MapScripts - .4byte Route132_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE132 - .byte MAPSEC_ROUTE_132 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json new file mode 100644 index 0000000000..719863d2b2 --- /dev/null +++ b/data/maps/Route132/map.json @@ -0,0 +1,162 @@ +{ + "id": "MAP_ROUTE132", + "name": "Route132", + "layout": "LAYOUT_ROUTE132", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_132", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE133" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_PACIFIDLOG_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 40, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route132_EventScript_1F74EA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 6, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route132_EventScript_1F7501", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route132_EventScript_291059", + "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 9, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F752F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 49, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route132_EventScript_1F7518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 33, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F7546", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 33, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F755D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 21, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F758B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F7574", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route132_EventScript_291066", + "flag": "FLAG_ITEM_ROUTE_132_PROTEIN" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc deleted file mode 100644 index 6a7777c4b2..0000000000 --- a/data/maps/Route133/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route133_MapConnectionsList: - connection left, 0, MAP_ROUTE134 - connection right, 0, MAP_ROUTE132 - -Route133_MapConnections: - .4byte 2 - .4byte Route133_MapConnectionsList - diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc deleted file mode 100644 index 641489016c..0000000000 --- a/data/maps/Route133/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_ITEM_ROUTE_133_BIG_PEARL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_ITEM_ROUTE_133_STAR_PIECE - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE - -Route133_MapEvents:: - map_events Route133_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc deleted file mode 100644 index 2d4cc8a664..0000000000 --- a/data/maps/Route133/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133: - .4byte Route133_Layout - .4byte Route133_MapEvents - .4byte Route133_MapScripts - .4byte Route133_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE133 - .byte MAPSEC_ROUTE_133 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json new file mode 100644 index 0000000000..36e7380f73 --- /dev/null +++ b/data/maps/Route133/map.json @@ -0,0 +1,162 @@ +{ + "id": "MAP_ROUTE133", + "name": "Route133", + "layout": "LAYOUT_ROUTE133", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_133", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE134" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE132" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 68, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 13, + "y": 3, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 68, + "y": 28, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 53, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_291073", + "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_291080", + "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route133_EventScript_1F75FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 37, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route133_EventScript_1F75E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 56, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F7616", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 56, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F762D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 48, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_29108D", + "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc deleted file mode 100644 index 30989b3741..0000000000 --- a/data/maps/Route134/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route134_MapConnectionsList: - connection left, 0, MAP_SLATEPORT_CITY - connection right, 0, MAP_ROUTE133 - -Route134_MapConnections: - .4byte 2 - .4byte Route134_MapConnectionsList - diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc deleted file mode 100644 index 83e693c267..0000000000 --- a/data/maps/Route134/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route134_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE - -Route134_MapEvents:: - map_events Route134_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc deleted file mode 100644 index 87bddf5c75..0000000000 --- a/data/maps/Route134/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route134: - .4byte Route134_Layout - .4byte Route134_MapEvents - .4byte Route134_MapScripts - .4byte Route134_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE134 - .byte MAPSEC_ROUTE_134 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json new file mode 100644 index 0000000000..350db1e051 --- /dev/null +++ b/data/maps/Route134/map.json @@ -0,0 +1,175 @@ +{ + "id": "MAP_ROUTE134", + "name": "Route134", + "layout": "LAYOUT_ROUTE134", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_134", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE133" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 49, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", + "movement_range_x": 3, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F7653", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 58, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route134_EventScript_1F766A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 41, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F7698", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 24, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route134_EventScript_1F7681", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 49, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route134_EventScript_1F76AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 43, + "y": 23, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F76F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 24, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route134_EventScript_1F770B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 50, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route134_EventScript_1F76DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 63, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route134_EventScript_1F76C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 50, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route134_EventScript_29109A", + "flag": "FLAG_ITEM_ROUTE_134_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 22, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route134_EventScript_2910A7", + "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc deleted file mode 100644 index c2921111f3..0000000000 --- a/data/maps/RustboroCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -RustboroCity_MapConnectionsList: - connection up, 0, MAP_ROUTE115 - connection down, 0, MAP_ROUTE104 - connection right, 0, MAP_ROUTE116 - -RustboroCity_MapConnections: - .4byte 3 - .4byte RustboroCity_MapConnectionsList - diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc deleted file mode 100644 index ecf816f7d4..0000000000 --- a/data/maps/RustboroCity/events.inc +++ /dev/null @@ -1,70 +0,0 @@ -RustboroCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT - object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND - object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 - -RustboroCity_MapWarps: - warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM - warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F - warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART - warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL - warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1 - warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE - warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2 - warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F - warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 - -RustboroCity_MapCoordEvents: - coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A - coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 - coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 - coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F - coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6 - coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE - coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A - coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16 - coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22 - coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B - coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37 - coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43 - coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F - coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3 - coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33 - coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73 - coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3 - coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3 - coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33 - coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 - coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 - -RustboroCity_MapBGEvents: - bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 - bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 - bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A - bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 - bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907 - bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A - bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 - bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC - bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 - bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 - -RustboroCity_MapEvents:: - map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents - diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc deleted file mode 100644 index f1f4a3d8ce..0000000000 --- a/data/maps/RustboroCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity: - .4byte RustboroCity_Layout - .4byte RustboroCity_MapEvents - .4byte RustboroCity_MapScripts - .4byte RustboroCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json new file mode 100644 index 0000000000..7d09f0cdcb --- /dev/null +++ b/data/maps/RustboroCity/map.json @@ -0,0 +1,601 @@ +{ + "id": "MAP_RUSTBORO_CITY", + "name": "RustboroCity", + "layout": "LAYOUT_RUSTBORO_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE115" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE104" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE116" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 22, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E088A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 19, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E085F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 25, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 21, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 12, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08B2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 26, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0893", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 24, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0922", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 25, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0938", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 30, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0ADD", + "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 13, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E087E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 36, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_2910DB", + "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 19, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E094E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 16, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0DB8", + "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 11, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 31, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E1236", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 27, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 30, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 45, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 38, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 34, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 15, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 38, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 30, + "y": 28, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 51, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 46, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE3", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 23, + "y": 20, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E095A" + }, + { + "type": "trigger", + "x": 23, + "y": 21, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E0971" + }, + { + "type": "trigger", + "x": 23, + "y": 22, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E0988" + }, + { + "type": "trigger", + "x": 23, + "y": 23, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E099F" + }, + { + "type": "trigger", + "x": 23, + "y": 24, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E09B6" + }, + { + "type": "trigger", + "x": 30, + "y": 9, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0AFE" + }, + { + "type": "trigger", + "x": 29, + "y": 10, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B0A" + }, + { + "type": "trigger", + "x": 30, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B16" + }, + { + "type": "trigger", + "x": 30, + "y": 12, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B22" + }, + { + "type": "trigger", + "x": 30, + "y": 9, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C2B" + }, + { + "type": "trigger", + "x": 31, + "y": 10, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C37" + }, + { + "type": "trigger", + "x": 30, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C43" + }, + { + "type": "trigger", + "x": 30, + "y": 12, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C4F" + }, + { + "type": "trigger", + "x": 12, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0DF3" + }, + { + "type": "trigger", + "x": 13, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0E33" + }, + { + "type": "trigger", + "x": 14, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0E73" + }, + { + "type": "trigger", + "x": 15, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0EB3" + }, + { + "type": "trigger", + "x": 16, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0EF3" + }, + { + "type": "trigger", + "x": 17, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0F33" + }, + { + "type": "trigger", + "x": 18, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0F73" + }, + { + "type": "trigger", + "x": 19, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0FB3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08F5" + }, + { + "type": "sign", + "x": 25, + "y": 35, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0910" + }, + { + "type": "sign", + "x": 17, + "y": 45, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 18, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 19, + "y": 49, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0907" + }, + { + "type": "sign", + "x": 18, + "y": 45, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 17, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 17, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08EC" + }, + { + "type": "sign", + "x": 30, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08E3" + }, + { + "type": "sign", + "x": 12, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0919" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc deleted file mode 100644 index 4980d5b959..0000000000 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_CuttersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 - -RustboroCity_CuttersHouse_MapWarps: - warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY - -RustboroCity_CuttersHouse_MapEvents:: - map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc deleted file mode 100644 index 434b27c3ef..0000000000 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_CuttersHouse: - .4byte RustboroCity_CuttersHouse_Layout - .4byte RustboroCity_CuttersHouse_MapEvents - .4byte RustboroCity_CuttersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json new file mode 100644 index 0000000000..f2490588a6 --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", + "name": "RustboroCity_CuttersHouse", + "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_CuttersHouse_EventScript_215BD4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_CuttersHouse_EventScript_215C0A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc deleted file mode 100644 index a3ed4affbd..0000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -RustboroCity_DevonCorp_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 - object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 - -RustboroCity_DevonCorp_1F_MapWarps: - warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY - warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F - -RustboroCity_DevonCorp_1F_MapBGEvents: - bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312 - bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309 - -RustboroCity_DevonCorp_1F_MapEvents:: - map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents - diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc deleted file mode 100644 index 3515eacb5b..0000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_1F: - .4byte RustboroCity_DevonCorp_1F_Layout - .4byte RustboroCity_DevonCorp_1F_MapEvents - .4byte RustboroCity_DevonCorp_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json new file mode 100644 index 0000000000..8bb9a2e2f9 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "name": "RustboroCity_DevonCorp_1F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_211261", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_211293", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 5 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 6 + }, + { + "x": 14, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_1F_EventScript_211312" + }, + { + "type": "sign", + "x": 8, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_1F_EventScript_211309" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc deleted file mode 100644 index fdf2e319ea..0000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 - -RustboroCity_DevonCorp_2F_MapWarps: - warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F - -RustboroCity_DevonCorp_2F_MapEvents:: - map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc deleted file mode 100644 index dea4bb1b4b..0000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F: - .4byte RustboroCity_DevonCorp_2F_Layout - .4byte RustboroCity_DevonCorp_2F_MapEvents - .4byte RustboroCity_DevonCorp_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json new file mode 100644 index 0000000000..01da7a9383 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "name": "RustboroCity_DevonCorp_2F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_21186F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_211886", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 10, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc deleted file mode 100644 index e9bae97463..0000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - -RustboroCity_DevonCorp_3F_MapWarps: - warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F - -RustboroCity_DevonCorp_3F_MapBGEvents: - bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 - bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 - -RustboroCity_DevonCorp_3F_MapEvents:: - map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents - diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc deleted file mode 100644 index f64fe62539..0000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F: - .4byte RustboroCity_DevonCorp_3F_Layout - .4byte RustboroCity_DevonCorp_3F_MapEvents - .4byte RustboroCity_DevonCorp_3F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json new file mode 100644 index 0000000000..91e8e53fc1 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", + "name": "RustboroCity_DevonCorp_3F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1", + "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 5, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc deleted file mode 100644 index 7f745cbfd8..0000000000 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_Flat1_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 - -RustboroCity_Flat1_1F_MapWarps: - warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY - warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY - warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F - -RustboroCity_Flat1_1F_MapEvents:: - map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc deleted file mode 100644 index ea268aed46..0000000000 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_1F: - .4byte RustboroCity_Flat1_1F_Layout - .4byte RustboroCity_Flat1_1F_MapEvents - .4byte RustboroCity_Flat1_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT1_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json new file mode 100644 index 0000000000..d0a4e56159 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT1_1F", + "name": "RustboroCity_Flat1_1F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_1F_EventScript_2150CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_1F_EventScript_2150D7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc deleted file mode 100644 index 02c650f870..0000000000 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -RustboroCity_Flat1_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 - object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - -RustboroCity_Flat1_2F_MapWarps: - warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F - -RustboroCity_Flat1_2F_MapEvents:: - map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc deleted file mode 100644 index 9f6d03649d..0000000000 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_2F: - .4byte RustboroCity_Flat1_2F_Layout - .4byte RustboroCity_Flat1_2F_MapEvents - .4byte RustboroCity_Flat1_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT1_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json new file mode 100644 index 0000000000..0f2de8d538 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -0,0 +1,133 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT1_2F", + "name": "RustboroCity_Flat1_2F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_21523D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY_DOLL", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TREECKO_DOLL", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TORCHIC_DOLL", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_21513A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MUDKIP_DOLL", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU_DOLL", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc deleted file mode 100644 index 82105a66a4..0000000000 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_Flat2_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 - -RustboroCity_Flat2_1F_MapWarps: - warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY - warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY - warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F - -RustboroCity_Flat2_1F_MapEvents:: - map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc deleted file mode 100644 index 73ae198856..0000000000 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_1F: - .4byte RustboroCity_Flat2_1F_Layout - .4byte RustboroCity_Flat2_1F_MapEvents - .4byte RustboroCity_Flat2_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json new file mode 100644 index 0000000000..9fab521c7a --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_1F", + "name": "RustboroCity_Flat2_1F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_1F_EventScript_215F80", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_1F_EventScript_215F77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 10 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 10 + }, + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc deleted file mode 100644 index fd8fad1a48..0000000000 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_Flat2_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 - -RustboroCity_Flat2_2F_MapWarps: - warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F - warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F - -RustboroCity_Flat2_2F_MapEvents:: - map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc deleted file mode 100644 index d002b54ae5..0000000000 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_2F: - .4byte RustboroCity_Flat2_2F_Layout - .4byte RustboroCity_Flat2_2F_MapEvents - .4byte RustboroCity_Flat2_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json new file mode 100644 index 0000000000..20ed3c9d45 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_2F", + "name": "RustboroCity_Flat2_2F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_2F_EventScript_215FD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_2F_EventScript_215FE1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc deleted file mode 100644 index a33992eb26..0000000000 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -RustboroCity_Flat2_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 - -RustboroCity_Flat2_3F_MapWarps: - warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F - -RustboroCity_Flat2_3F_MapEvents:: - map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc deleted file mode 100644 index 1b7f52fcaf..0000000000 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_3F: - .4byte RustboroCity_Flat2_3F_Layout - .4byte RustboroCity_Flat2_3F_MapEvents - .4byte RustboroCity_Flat2_3F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_3F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json new file mode 100644 index 0000000000..8ad2605112 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_3F", + "name": "RustboroCity_Flat2_3F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_3F_EventScript_216117", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_3F_EventScript_216120", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc deleted file mode 100644 index 3fb1517998..0000000000 --- a/data/maps/RustboroCity_Gym/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -RustboroCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 - -RustboroCity_Gym_MapWarps: - warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY - warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY - -RustboroCity_Gym_MapBGEvents: - bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 - bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 - -RustboroCity_Gym_MapEvents:: - map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents - diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc deleted file mode 100644 index 4f043ed982..0000000000 --- a/data/maps/RustboroCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Gym: - .4byte RustboroCity_Gym_Layout - .4byte RustboroCity_Gym_MapEvents - .4byte RustboroCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_RUSTBORO_CITY_GYM - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json new file mode 100644 index 0000000000..ace68d0577 --- /dev/null +++ b/data/maps/RustboroCity_Gym/map.json @@ -0,0 +1,118 @@ +{ + "id": "MAP_RUSTBORO_CITY_GYM", + "name": "RustboroCity_Gym", + "layout": "LAYOUT_RUSTBORO_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Gym_EventScript_212F31", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RustboroCity_Gym_EventScript_212FE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RustboroCity_Gym_EventScript_212FFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Gym_EventScript_213028", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RustboroCity_Gym_EventScript_213011", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_Gym_EventScript_213047" + }, + { + "type": "sign", + "x": 8, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_Gym_EventScript_213057" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc deleted file mode 100644 index 4278568e6e..0000000000 --- a/data/maps/RustboroCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 - -RustboroCity_House1_MapWarps: - warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY - warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY - -RustboroCity_House1_MapEvents:: - map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc deleted file mode 100644 index 22c08344aa..0000000000 --- a/data/maps/RustboroCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House1: - .4byte RustboroCity_House1_Layout - .4byte RustboroCity_House1_MapEvents - .4byte RustboroCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE1 - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json new file mode 100644 index 0000000000..598429b227 --- /dev/null +++ b/data/maps/RustboroCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE1", + "name": "RustboroCity_House1", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House1_EventScript_21593F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House1_EventScript_2159DF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc deleted file mode 100644 index 87f324126c..0000000000 --- a/data/maps/RustboroCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 - -RustboroCity_House2_MapWarps: - warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY - -RustboroCity_House2_MapEvents:: - map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc deleted file mode 100644 index 564b2aecc8..0000000000 --- a/data/maps/RustboroCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House2: - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House2_MapEvents - .4byte RustboroCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json new file mode 100644 index 0000000000..7533e995b9 --- /dev/null +++ b/data/maps/RustboroCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE2", + "name": "RustboroCity_House2", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House2_EventScript_215EB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House2_EventScript_215EBD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc deleted file mode 100644 index 3d32a9c731..0000000000 --- a/data/maps/RustboroCity_House3/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 - -RustboroCity_House3_MapWarps: - warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY - -RustboroCity_House3_MapEvents:: - map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc deleted file mode 100644 index eea35721ca..0000000000 --- a/data/maps/RustboroCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House3: - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House3_MapEvents - .4byte RustboroCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json new file mode 100644 index 0000000000..c11aa89e38 --- /dev/null +++ b/data/maps/RustboroCity_House3/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE3", + "name": "RustboroCity_House3", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_216191", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_21619A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_2161A3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 11 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc deleted file mode 100644 index 131ffe24b2..0000000000 --- a/data/maps/RustboroCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -RustboroCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 - -RustboroCity_Mart_MapWarps: - warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY - warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY - -RustboroCity_Mart_MapEvents:: - map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc deleted file mode 100644 index f6dbd60a58..0000000000 --- a/data/maps/RustboroCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Mart: - .4byte Mart_Layout - .4byte RustboroCity_Mart_MapEvents - .4byte RustboroCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json new file mode 100644 index 0000000000..714edcd584 --- /dev/null +++ b/data/maps/RustboroCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_RUSTBORO_CITY_MART", + "name": "RustboroCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F7D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F86", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 50b18e8823..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 - -RustboroCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY - warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY - warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F - -RustboroCity_PokemonCenter_1F_MapEvents:: - map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 71f0d8b258..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte RustboroCity_PokemonCenter_1F_MapEvents - .4byte RustboroCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..aabe2785fe --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "name": "RustboroCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc deleted file mode 100644 index a565f259b4..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -RustboroCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -RustboroCity_PokemonCenter_2F_MapEvents:: - map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 2ee6bdfd15..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte RustboroCity_PokemonCenter_2F_MapEvents - .4byte RustboroCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..9c63421e36 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", + "name": "RustboroCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc deleted file mode 100644 index 0d230b178b..0000000000 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -RustboroCity_PokemonSchool_EventObjects: - object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 - object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT - -RustboroCity_PokemonSchool_MapWarps: - warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY - warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY - -RustboroCity_PokemonSchool_MapBGEvents: - bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C - -RustboroCity_PokemonSchool_MapEvents:: - map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents - diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc deleted file mode 100644 index e02d9c7110..0000000000 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonSchool: - .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_PokemonSchool_MapEvents - .4byte RustboroCity_PokemonSchool_MapScripts - .4byte 0x0 - .2byte MUS_P_SCHOOL - .2byte LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json new file mode 100644 index 0000000000..fb6944f400 --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -0,0 +1,168 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", + "name": "RustboroCity_PokemonSchool", + "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", + "music": "MUS_P_SCHOOL", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F5F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F68", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F71", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F95", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 0, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_214040", + "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT" + } + ], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 4, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 6, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 7, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 3, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213F8C" + } + ] +} \ No newline at end of file diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc deleted file mode 100644 index ea48a4828a..0000000000 --- a/data/maps/RusturfTunnel/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -RusturfTunnel_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN - -RusturfTunnel_MapWarps: - warp_def 4, 10, 3, 0, MAP_ROUTE116 - warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN - warp_def 18, 20, 3, 2, MAP_ROUTE116 - -RusturfTunnel_MapCoordEvents: - coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 - coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 - coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 - coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 - coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D - -RusturfTunnel_MapEvents:: - map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc deleted file mode 100644 index 8bb9fa94fa..0000000000 --- a/data/maps/RusturfTunnel/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RusturfTunnel: - .4byte RusturfTunnel_Layout - .4byte RusturfTunnel_MapEvents - .4byte RusturfTunnel_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_RUSTURF_TUNNEL - .byte MAPSEC_RUSTURF_TUNNEL - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json new file mode 100644 index 0000000000..424dd4789c --- /dev/null +++ b/data/maps/RusturfTunnel/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_RUSTURF_TUNNEL", + "name": "RusturfTunnel", + "layout": "LAYOUT_RUSTURF_TUNNEL", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_RUSTURF_TUNNEL", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22CE76", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_2907A6", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_291136", + "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_291143", + "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22D0C2", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22D0AF", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 24, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_2907A6", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 32, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RusturfTunnel_EventScript_22D1B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22CE5F", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 16, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 4 + }, + { + "x": 18, + "y": 20, + "elevation": 3, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 23, + "y": 4, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D071" + }, + { + "type": "trigger", + "x": 9, + "y": 4, + "elevation": 3, + "var": "VAR_RUSTURF_TUNNEL_STATE", + "var_value": 2, + "script": "RusturfTunnel_EventScript_22D083" + }, + { + "type": "trigger", + "x": 9, + "y": 5, + "elevation": 3, + "var": "VAR_RUSTURF_TUNNEL_STATE", + "var_value": 2, + "script": "RusturfTunnel_EventScript_22D083" + }, + { + "type": "trigger", + "x": 25, + "y": 4, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D077" + }, + { + "type": "trigger", + "x": 25, + "y": 5, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D07D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc deleted file mode 100644 index 56a07b43e4..0000000000 --- a/data/maps/SSTidalCorridor/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -SSTidalCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT - -SSTidalCorridor_MapWarps: - warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS - warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS - warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS - warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS - warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS - warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS - warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS - warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS - warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK - -SSTidalCorridor_MapBGEvents: - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0F5 - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0FE - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 - bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 - -SSTidalCorridor_MapEvents:: - map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents - diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc deleted file mode 100644 index 972fae2154..0000000000 --- a/data/maps/SSTidalCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalCorridor: - .4byte SSTidalCorridor_Layout - .4byte SSTidalCorridor_MapEvents - .4byte SSTidalCorridor_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_CORRIDOR - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json new file mode 100644 index 0000000000..c8192aaa84 --- /dev/null +++ b/data/maps/SSTidalCorridor/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_SS_TIDAL_CORRIDOR", + "name": "SSTidalCorridor", + "layout": "LAYOUT_SS_TIDAL_CORRIDOR", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 1, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C119", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 16, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C1A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C0D9", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C0E2", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 8 + }, + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 9 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 10 + }, + { + "x": 13, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 11 + }, + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_LOWER_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 4, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 6, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 14, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C0F5" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C0FE" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C107" + }, + { + "type": "sign", + "x": 14, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C110" + } + ] +} \ No newline at end of file diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc deleted file mode 100644 index 73385dfc3a..0000000000 --- a/data/maps/SSTidalLowerDeck/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSTidalLowerDeck_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 - -SSTidalLowerDeck_MapWarps: - warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR - -SSTidalLowerDeck_MapBGEvents: - bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS - -SSTidalLowerDeck_MapEvents:: - map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents - diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc deleted file mode 100644 index c14cf55130..0000000000 --- a/data/maps/SSTidalLowerDeck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalLowerDeck: - .4byte SSTidalLowerDeck_Layout - .4byte SSTidalLowerDeck_MapEvents - .4byte SSTidalLowerDeck_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_LOWER_DECK - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json new file mode 100644 index 0000000000..1a7b1fde0f --- /dev/null +++ b/data/maps/SSTidalLowerDeck/map.json @@ -0,0 +1,64 @@ +{ + "id": "MAP_SS_TIDAL_LOWER_DECK", + "name": "SSTidalLowerDeck", + "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalLowerDeck_EventScript_23C819", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 7, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalLowerDeck_EventScript_23C830", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 0, + "y": 2, + "elevation": 0, + "item": "ITEM_LEFTOVERS", + "flag": "FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS" + } + ] +} \ No newline at end of file diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc deleted file mode 100644 index dc8a57164b..0000000000 --- a/data/maps/SSTidalRooms/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -SSTidalRooms_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 - object_event 6, EVENT_OBJ_GFX_RICH_BOY, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER - -SSTidalRooms_MapWarps: - warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR - warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR - warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR - warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR - warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR - warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR - warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR - warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR - warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR - warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR - warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR - warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR - -SSTidalRooms_MapBGEvents: - bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 - bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 - -SSTidalRooms_MapEvents:: - map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents - diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc deleted file mode 100644 index 951cd6ce13..0000000000 --- a/data/maps/SSTidalRooms/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalRooms: - .4byte SSTidalRooms_Layout - .4byte SSTidalRooms_MapEvents - .4byte SSTidalRooms_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_ROOMS - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json new file mode 100644 index 0000000000..935c5c33d3 --- /dev/null +++ b/data/maps/SSTidalRooms/map.json @@ -0,0 +1,227 @@ +{ + "id": "MAP_SS_TIDAL_ROOMS", + "name": "SSTidalRooms", + "layout": "LAYOUT_SS_TIDAL_ROOMS", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CA49", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 34, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalRooms_EventScript_23CA60", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 21, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CA77", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSTidalRooms_EventScript_23CA8E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSTidalRooms_EventScript_23CAA9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 22, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalRooms_EventScript_23CAC4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CADB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 28, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23C9F2", + "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 23, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 5 + }, + { + "x": 22, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 6 + }, + { + "x": 31, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalRooms_EventScript_23CA33" + }, + { + "type": "sign", + "x": 15, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalRooms_EventScript_23CA33" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc deleted file mode 100644 index 131338df92..0000000000 --- a/data/maps/SafariZone_North/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SafariZone_North_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_NORTHWEST - connection down, 0, MAP_SAFARI_ZONE_SOUTH - connection right, 0, MAP_SAFARI_ZONE_NORTHEAST - -SafariZone_North_MapConnections: - .4byte 3 - .4byte SafariZone_North_MapConnectionsList - diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc deleted file mode 100644 index 1131cd7146..0000000000 --- a/data/maps/SafariZone_North/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_North_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM - -SafariZone_North_MapEvents:: - map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc deleted file mode 100644 index 935a2c5a6e..0000000000 --- a/data/maps/SafariZone_North/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_North: - .4byte SafariZone_North_Layout - .4byte SafariZone_North_MapEvents - .4byte SafariZone_North_MapScripts - .4byte SafariZone_North_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTH - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json new file mode 100644 index 0000000000..e0202beb9a --- /dev/null +++ b/data/maps/SafariZone_North/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTH", + "name": "SafariZone_North", + "layout": "LAYOUT_SAFARI_ZONE_NORTH", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHWEST" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_23D254", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 6, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_23D25D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 25, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 25, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2912C9", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc deleted file mode 100644 index 20595bd7af..0000000000 --- a/data/maps/SafariZone_Northeast/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Northeast_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_NORTH - connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST - -SafariZone_Northeast_MapConnections: - .4byte 2 - .4byte SafariZone_Northeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc deleted file mode 100644 index 02bb2fc19b..0000000000 --- a/data/maps/SafariZone_Northeast/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SafariZone_Northeast_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_11 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET - -SafariZone_Northeast_MapBGEvents: - bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY - bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC - -SafariZone_Northeast_MapEvents:: - map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents - diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc deleted file mode 100644 index 8c68cd8c29..0000000000 --- a/data/maps/SafariZone_Northeast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northeast: - .4byte SafariZone_Northeast_Layout - .4byte SafariZone_Northeast_MapEvents - .4byte SafariZone_Northeast_MapScripts - .4byte SafariZone_Northeast_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTHEAST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json new file mode 100644 index 0000000000..6ce7c4d019 --- /dev/null +++ b/data/maps/SafariZone_Northeast/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTHEAST", + "name": "SafariZone_Northeast", + "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 8, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 30, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3D8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 13, + "y": 35, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3CF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2912E3", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 31, + "y": 35, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY" + }, + { + "type": "hidden_item", + "x": 21, + "y": 5, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc deleted file mode 100644 index 24ac78021e..0000000000 --- a/data/maps/SafariZone_Northwest/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Northwest_MapConnectionsList: - connection right, 0, MAP_SAFARI_ZONE_NORTH - connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST - -SafariZone_Northwest_MapConnections: - .4byte 2 - .4byte SafariZone_Northwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc deleted file mode 100644 index 729e51734e..0000000000 --- a/data/maps/SafariZone_Northwest/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Northwest_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 - -SafariZone_Northwest_MapEvents:: - map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc deleted file mode 100644 index 1218a65139..0000000000 --- a/data/maps/SafariZone_Northwest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northwest: - .4byte SafariZone_Northwest_Layout - .4byte SafariZone_Northwest_MapEvents - .4byte SafariZone_Northwest_MapScripts - .4byte SafariZone_Northwest_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTHWEST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json new file mode 100644 index 0000000000..910c7cf3c1 --- /dev/null +++ b/data/maps/SafariZone_Northwest/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTHWEST", + "name": "SafariZone_Northwest", + "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHWEST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 8, + "y": 8, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northwest_EventScript_23D24A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northwest_EventScript_2912BC", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc deleted file mode 100644 index 2d601b883a..0000000000 --- a/data/maps/SafariZone_RestHouse/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_RestHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 - -SafariZone_RestHouse_MapWarps: - warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - -SafariZone_RestHouse_MapEvents:: - map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc deleted file mode 100644 index 79d807c7fd..0000000000 --- a/data/maps/SafariZone_RestHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_RestHouse: - .4byte SafariZone_RestHouse_Layout - .4byte SafariZone_RestHouse_MapEvents - .4byte SafariZone_RestHouse_MapScripts - .4byte 0x0 - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_REST_HOUSE - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json new file mode 100644 index 0000000000..16acff6dd8 --- /dev/null +++ b/data/maps/SafariZone_RestHouse/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SAFARI_ZONE_REST_HOUSE", + "name": "SafariZone_RestHouse", + "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BF0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BF9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc deleted file mode 100644 index 4c2e912ca4..0000000000 --- a/data/maps/SafariZone_South/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SafariZone_South_MapConnectionsList: - connection up, 0, MAP_SAFARI_ZONE_NORTH - connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST - connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST - -SafariZone_South_MapConnections: - .4byte 3 - .4byte SafariZone_South_MapConnectionsList - diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc deleted file mode 100644 index 8bc56885fe..0000000000 --- a/data/maps/SafariZone_South/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_South_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - -SafariZone_South_MapWarps: - warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -SafariZone_South_MapEvents:: - map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc deleted file mode 100644 index 01fcac57f4..0000000000 --- a/data/maps/SafariZone_South/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_South: - .4byte SafariZone_South_Layout - .4byte SafariZone_South_MapEvents - .4byte SafariZone_South_MapScripts - .4byte SafariZone_South_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTH - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json new file mode 100644 index 0000000000..c958a1a944 --- /dev/null +++ b/data/maps/SafariZone_South/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTH", + "name": "SafariZone_South", + "layout": "LAYOUT_SAFARI_ZONE_SOUTH", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHWEST" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 32, + "y": 34, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 26, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 16, + "y": 6, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2D3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 36, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D390", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 36, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D3A2", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" + } + ], + "warp_events": [ + { + "x": 32, + "y": 33, + "elevation": 0, + "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc deleted file mode 100644 index 5a7b4140a2..0000000000 --- a/data/maps/SafariZone_Southeast/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Southeast_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_SOUTH - connection up, 0, MAP_SAFARI_ZONE_NORTHEAST - -SafariZone_Southeast_MapConnections: - .4byte 2 - .4byte SafariZone_Southeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc deleted file mode 100644 index a35a8564d7..0000000000 --- a/data/maps/SafariZone_Southeast/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_Southeast_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - -SafariZone_Southeast_MapBGEvents: - bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP - bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE - -SafariZone_Southeast_MapEvents:: - map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents - diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc deleted file mode 100644 index b07747fd5c..0000000000 --- a/data/maps/SafariZone_Southeast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southeast: - .4byte SafariZone_Southeast_Layout - .4byte SafariZone_Southeast_MapEvents - .4byte SafariZone_Southeast_MapScripts - .4byte SafariZone_Southeast_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTHEAST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json new file mode 100644 index 0000000000..d2e3d7140a --- /dev/null +++ b/data/maps/SafariZone_Southeast/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTHEAST", + "name": "SafariZone_Southeast", + "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + }, + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 20, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3B4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 8, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3AB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_2912F0", + "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D399", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 19, + "y": 36, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP" + }, + { + "type": "hidden_item", + "x": 32, + "y": 33, + "elevation": 0, + "item": "ITEM_FULL_RESTORE", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc deleted file mode 100644 index 34702a3c29..0000000000 --- a/data/maps/SafariZone_Southwest/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Southwest_MapConnectionsList: - connection up, 0, MAP_SAFARI_ZONE_NORTHWEST - connection right, 0, MAP_SAFARI_ZONE_SOUTH - -SafariZone_Southwest_MapConnections: - .4byte 2 - .4byte SafariZone_Southwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc deleted file mode 100644 index 6a6a488879..0000000000 --- a/data/maps/SafariZone_Southwest/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SafariZone_Southwest_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE - -SafariZone_Southwest_MapWarps: - warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE - -SafariZone_Southwest_MapBGEvents: - bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 - -SafariZone_Southwest_MapEvents:: - map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents - diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc deleted file mode 100644 index f3cafdebb7..0000000000 --- a/data/maps/SafariZone_Southwest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southwest: - .4byte SafariZone_Southwest_Layout - .4byte SafariZone_Southwest_MapEvents - .4byte SafariZone_Southwest_MapScripts - .4byte SafariZone_Southwest_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTHWEST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json new file mode 100644 index 0000000000..41cce9e80b --- /dev/null +++ b/data/maps/SafariZone_Southwest/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTHWEST", + "name": "SafariZone_Southwest", + "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHWEST" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southwest_EventScript_23D267", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southwest_EventScript_2912D6", + "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE" + } + ], + "warp_events": [ + { + "x": 29, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_REST_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SafariZone_Southwest_EventScript_23D270" + } + ] +} \ No newline at end of file diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc deleted file mode 100644 index f43240a781..0000000000 --- a/data/maps/ScorchedSlab/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ScorchedSlab_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11 - -ScorchedSlab_MapWarps: - warp_def 7, 16, 1, 1, MAP_ROUTE120 - -ScorchedSlab_MapEvents:: - map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc deleted file mode 100644 index ec09efb0fc..0000000000 --- a/data/maps/ScorchedSlab/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ScorchedSlab: - .4byte ScorchedSlab_Layout - .4byte ScorchedSlab_MapEvents - .4byte ScorchedSlab_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_SCORCHED_SLAB - .byte MAPSEC_SCORCHED_SLAB - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json new file mode 100644 index 0000000000..f24aa0ebac --- /dev/null +++ b/data/maps/ScorchedSlab/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SCORCHED_SLAB", + "name": "ScorchedSlab", + "layout": "LAYOUT_SCORCHED_SLAB", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_SCORCHED_SLAB", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ScorchedSlab_EventScript_2912AF", + "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11" + } + ], + "warp_events": [ + { + "x": 7, + "y": 16, + "elevation": 1, + "dest_map": "MAP_ROUTE120", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc deleted file mode 100644 index ea20574178..0000000000 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SeafloorCavern_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT - -SeafloorCavern_Entrance_MapWarps: - warp_def 10, 18, 3, 0, MAP_UNDERWATER4 - warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 - -SeafloorCavern_Entrance_MapEvents:: - map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc deleted file mode 100644 index b1b8ec30c9..0000000000 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Entrance: - .4byte SeafloorCavern_Entrance_Layout - .4byte SeafloorCavern_Entrance_MapEvents - .4byte SeafloorCavern_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ENTRANCE - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json new file mode 100644 index 0000000000..c1f45f1bf1 --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "name": "SeafloorCavern_Entrance", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Entrance_EventScript_234485", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_UNDERWATER4", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc deleted file mode 100644 index a5cb5ed3b1..0000000000 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room1_MapWarps: - warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 - -SeafloorCavern_Room1_MapEvents:: - map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc deleted file mode 100644 index 14ab5fbdeb..0000000000 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1: - .4byte SeafloorCavern_Room1_Layout - .4byte SeafloorCavern_Room1_MapEvents - .4byte SeafloorCavern_Room1_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM1 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json new file mode 100644 index 0000000000..3976ff46a1 --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM1", + "name": "SeafloorCavern_Room1", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SeafloorCavern_Room1_EventScript_2347EC", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room1_EventScript_234803", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 5, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc deleted file mode 100644 index 5e1af80276..0000000000 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room2_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_18 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17 - -SeafloorCavern_Room2_MapWarps: - warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 - warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 - warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 - warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 - -SeafloorCavern_Room2_MapEvents:: - map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc deleted file mode 100644 index 822c7f2b10..0000000000 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room2: - .4byte SeafloorCavern_Room2_Layout - .4byte SeafloorCavern_Room2_MapEvents - .4byte SeafloorCavern_Room2_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM2 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json new file mode 100644 index 0000000000..19b8b05736 --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM2", + "name": "SeafloorCavern_Room2", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2907A6", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2907A6", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + } + ], + "warp_events": [ + { + "x": 10, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc deleted file mode 100644 index 168e9e96db..0000000000 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room3_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_16 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_18 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_19 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room3_MapWarps: - warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 - warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 - warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 - -SeafloorCavern_Room3_MapEvents:: - map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc deleted file mode 100644 index f1cfa25681..0000000000 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room3: - .4byte SeafloorCavern_Room3_Layout - .4byte SeafloorCavern_Room3_MapEvents - .4byte SeafloorCavern_Room3_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM3 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json new file mode 100644 index 0000000000..b7e46a87f1 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM3", + "name": "SeafloorCavern_Room3", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "SeafloorCavern_Room3_EventScript_234938", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SeafloorCavern_Room3_EventScript_23494F", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 8, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc deleted file mode 100644 index 37f0c7b04c..0000000000 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SeafloorCavern_Room4_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room4_MapWarps: - warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - -SeafloorCavern_Room4_MapEvents:: - map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc deleted file mode 100644 index 22e6d27c75..0000000000 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room4: - .4byte SeafloorCavern_Room4_Layout - .4byte SeafloorCavern_Room4_MapEvents - .4byte SeafloorCavern_Room4_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM4 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json new file mode 100644 index 0000000000..02662f0177 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM4", + "name": "SeafloorCavern_Room4", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room4_EventScript_234C9C", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room4_EventScript_234CB3", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc deleted file mode 100644 index 4f75732700..0000000000 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SeafloorCavern_Room5_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14 - -SeafloorCavern_Room5_MapWarps: - warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 - warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 - warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 - -SeafloorCavern_Room5_MapEvents:: - map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc deleted file mode 100644 index 42489c1dea..0000000000 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room5: - .4byte SeafloorCavern_Room5_Layout - .4byte SeafloorCavern_Room5_MapEvents - .4byte SeafloorCavern_Room5_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM5 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json new file mode 100644 index 0000000000..cfdbd64efe --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -0,0 +1,121 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM5", + "name": "SeafloorCavern_Room5", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc deleted file mode 100644 index 596daefe2f..0000000000 --- a/data/maps/SeafloorCavern_Room6/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafloorCavern_Room6_MapWarps: - warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 - warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - -SeafloorCavern_Room6_MapEvents:: - map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc deleted file mode 100644 index f70a2d07e4..0000000000 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room6: - .4byte SeafloorCavern_Room6_Layout - .4byte SeafloorCavern_Room6_MapEvents - .4byte SeafloorCavern_Room6_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM6 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json new file mode 100644 index 0000000000..69c5330ead --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM6", + "name": "SeafloorCavern_Room6", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 21, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 8, + "elevation": 1, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc deleted file mode 100644 index fb3fcc1b6c..0000000000 --- a/data/maps/SeafloorCavern_Room7/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SeafloorCavern_Room7_MapWarps: - warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room7_MapEvents:: - map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc deleted file mode 100644 index 28433a0519..0000000000 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room7: - .4byte SeafloorCavern_Room7_Layout - .4byte SeafloorCavern_Room7_MapEvents - .4byte SeafloorCavern_Room7_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM7 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json new file mode 100644 index 0000000000..65c103aafb --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM7", + "name": "SeafloorCavern_Room7", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc deleted file mode 100644 index 673f303fe7..0000000000 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -SeafloorCavern_Room8_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1A - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C - -SeafloorCavern_Room8_MapWarps: - warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 - warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room8_MapEvents:: - map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc deleted file mode 100644 index bc6f7de4b6..0000000000 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room8: - .4byte SeafloorCavern_Room8_Layout - .4byte SeafloorCavern_Room8_MapEvents - .4byte SeafloorCavern_Room8_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM8 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json new file mode 100644 index 0000000000..f556c23334 --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -0,0 +1,192 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM8", + "name": "SeafloorCavern_Room8", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1A" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1C" + } + ], + "warp_events": [ + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM9", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc deleted file mode 100644 index 771f58b150..0000000000 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SeafloorCavern_Room9_EventObjects: - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 - -SeafloorCavern_Room9_MapWarps: - warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 - -SeafloorCavern_Room9_MapCoordEvents: - coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 - -SeafloorCavern_Room9_MapEvents:: - map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 - diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc deleted file mode 100644 index 5748571be5..0000000000 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room9: - .4byte SeafloorCavern_Room9_Layout - .4byte SeafloorCavern_Room9_MapEvents - .4byte SeafloorCavern_Room9_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM9 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json new file mode 100644 index 0000000000..c2d8b8870d --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -0,0 +1,130 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM9", + "name": "SeafloorCavern_Room9", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "x": 17, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 9, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 9, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 8, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 8, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room9_EventScript_291401", + "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_2", + "x": 17, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2" + } + ], + "warp_events": [ + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 42, + "elevation": 3, + "var": "VAR_0x40A2", + "var_value": 0, + "script": "SeafloorCavern_Room9_EventScript_234DC9" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc deleted file mode 100644 index 96891324d0..0000000000 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SealedChamber_InnerRoom_MapWarps: - warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM - -SealedChamber_InnerRoom_MapBGEvents: - bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255 - bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F - bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239269 - bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239273 - bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23927D - bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239287 - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - -SealedChamber_InnerRoom_MapEvents:: - map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents - diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc deleted file mode 100644 index 6e2a2ff8b8..0000000000 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_InnerRoom: - .4byte SealedChamber_InnerRoom_Layout - .4byte SealedChamber_InnerRoom_MapEvents - .4byte SealedChamber_InnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_SEALED_CHAMBER_INNER_ROOM - .byte MAPSEC_SEALED_CHAMBER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json new file mode 100644 index 0000000000..e0e6097ec3 --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_SEALED_CHAMBER_INNER_ROOM", + "name": "SealedChamber_InnerRoom", + "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEALED_CHAMBER_OUTER_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239255" + }, + { + "type": "sign", + "x": 14, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_23925F" + }, + { + "type": "sign", + "x": 4, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239269" + }, + { + "type": "sign", + "x": 16, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239273" + }, + { + "type": "sign", + "x": 6, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_23927D" + }, + { + "type": "sign", + "x": 14, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239287" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + }, + { + "type": "sign", + "x": 11, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + } + ] +} \ No newline at end of file diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc deleted file mode 100644 index 530ff738c8..0000000000 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ /dev/null @@ -1,37 +0,0 @@ -SealedChamber_OuterRoom_MapWarps: - warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM - -SealedChamber_OuterRoom_MapBGEvents: - bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391B2 - bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391C6 - bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391D0 - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED - bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED - -SealedChamber_OuterRoom_MapEvents:: - map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents - diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc deleted file mode 100644 index bdb40d153a..0000000000 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_OuterRoom: - .4byte SealedChamber_OuterRoom_Layout - .4byte SealedChamber_OuterRoom_MapEvents - .4byte SealedChamber_OuterRoom_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_SEALED_CHAMBER_OUTER_ROOM - .byte MAPSEC_SEALED_CHAMBER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json new file mode 100644 index 0000000000..cc9c32272d --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -0,0 +1,261 @@ +{ + "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", + "name": "SealedChamber_OuterRoom", + "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEALED_CHAMBER_INNER_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 5, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 5, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 11, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 11, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391B2" + }, + { + "type": "sign", + "x": 16, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391C6" + }, + { + "type": "sign", + "x": 10, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391D0" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 4, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 4, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 4, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 6, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 4, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 6, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 12, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 10, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 12, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 10, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 12, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 12, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 9, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391ED" + }, + { + "type": "sign", + "x": 11, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391ED" + } + ] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc deleted file mode 100644 index f0cfb017f7..0000000000 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BlueCave1_MapEvents:: - map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc deleted file mode 100644 index 5159eec532..0000000000 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave1: - .4byte SecretBase_BlueCave1_Layout - .4byte SecretBase_BlueCave1_MapEvents - .4byte SecretBase_BlueCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json new file mode 100644 index 0000000000..ee7806e57c --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE1", + "name": "SecretBase_BlueCave1", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc deleted file mode 100644 index 9a2a82db6f..0000000000 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave2_MapWarps: - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_BlueCave2_MapEvents:: - map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc deleted file mode 100644 index 4d893835b5..0000000000 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave2: - .4byte SecretBase_BlueCave2_Layout - .4byte SecretBase_BlueCave2_MapEvents - .4byte SecretBase_BlueCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json new file mode 100644 index 0000000000..cdba6e817f --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE2", + "name": "SecretBase_BlueCave2", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 2, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc deleted file mode 100644 index 463c513e58..0000000000 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave3_MapWarps: - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave3_MapEvents:: - map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc deleted file mode 100644 index 1e730552ed..0000000000 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave3: - .4byte SecretBase_BlueCave3_Layout - .4byte SecretBase_BlueCave3_MapEvents - .4byte SecretBase_BlueCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json new file mode 100644 index 0000000000..5dc78c8915 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE3", + "name": "SecretBase_BlueCave3", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 15, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc deleted file mode 100644 index fd121b5948..0000000000 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave4_MapWarps: - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave4_MapEvents:: - map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc deleted file mode 100644 index ff6cb64dc2..0000000000 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave4: - .4byte SecretBase_BlueCave4_Layout - .4byte SecretBase_BlueCave4_MapEvents - .4byte SecretBase_BlueCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json new file mode 100644 index 0000000000..dfc9c67a82 --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE4", + "name": "SecretBase_BlueCave4", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 15, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc deleted file mode 100644 index 82e5232985..0000000000 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave1_MapEvents:: - map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc deleted file mode 100644 index e20bdbce1f..0000000000 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave1: - .4byte SecretBase_BrownCave1_Layout - .4byte SecretBase_BrownCave1_MapEvents - .4byte SecretBase_BrownCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json new file mode 100644 index 0000000000..20411331f9 --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE1", + "name": "SecretBase_BrownCave1", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc deleted file mode 100644 index 86d18b5d9e..0000000000 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave2_MapWarps: - warp_def 1, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave2_MapEvents:: - map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc deleted file mode 100644 index 93f2b59237..0000000000 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave2: - .4byte SecretBase_BrownCave2_Layout - .4byte SecretBase_BrownCave2_MapEvents - .4byte SecretBase_BrownCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json new file mode 100644 index 0000000000..8001492235 --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE2", + "name": "SecretBase_BrownCave2", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc deleted file mode 100644 index 2ec6ed1b25..0000000000 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave3_MapWarps: - warp_def 11, 9, 0, 126, MAP_NONE - -SecretBase_BrownCave3_MapEvents:: - map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc deleted file mode 100644 index 5c4fac1c0a..0000000000 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave3: - .4byte SecretBase_BrownCave3_Layout - .4byte SecretBase_BrownCave3_MapEvents - .4byte SecretBase_BrownCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json new file mode 100644 index 0000000000..08ccc8c323 --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE3", + "name": "SecretBase_BrownCave3", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 11, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc deleted file mode 100644 index 58e71dc186..0000000000 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave4_MapWarps: - warp_def 2, 8, 0, 126, MAP_NONE - -SecretBase_BrownCave4_MapEvents:: - map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc deleted file mode 100644 index b3123ee222..0000000000 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave4: - .4byte SecretBase_BrownCave4_Layout - .4byte SecretBase_BrownCave4_MapEvents - .4byte SecretBase_BrownCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json new file mode 100644 index 0000000000..f6184cee21 --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE4", + "name": "SecretBase_BrownCave4", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 2, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc deleted file mode 100644 index 015e2bde58..0000000000 --- a/data/maps/SecretBase_RedCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_RedCave1_MapEvents:: - map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc deleted file mode 100644 index 4ac30b1cb8..0000000000 --- a/data/maps/SecretBase_RedCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave1: - .4byte SecretBase_RedCave1_Layout - .4byte SecretBase_RedCave1_MapEvents - .4byte SecretBase_RedCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json new file mode 100644 index 0000000000..309dd3de09 --- /dev/null +++ b/data/maps/SecretBase_RedCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE1", + "name": "SecretBase_RedCave1", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc deleted file mode 100644 index 70997288dc..0000000000 --- a/data/maps/SecretBase_RedCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave2_MapWarps: - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_RedCave2_MapEvents:: - map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc deleted file mode 100644 index 64ef711962..0000000000 --- a/data/maps/SecretBase_RedCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave2: - .4byte SecretBase_RedCave2_Layout - .4byte SecretBase_RedCave2_MapEvents - .4byte SecretBase_RedCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json new file mode 100644 index 0000000000..0c2162856a --- /dev/null +++ b/data/maps/SecretBase_RedCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE2", + "name": "SecretBase_RedCave2", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc deleted file mode 100644 index 191aed927b..0000000000 --- a/data/maps/SecretBase_RedCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave3_MapWarps: - warp_def 3, 6, 0, 126, MAP_NONE - -SecretBase_RedCave3_MapEvents:: - map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc deleted file mode 100644 index 880fa84e60..0000000000 --- a/data/maps/SecretBase_RedCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave3: - .4byte SecretBase_RedCave3_Layout - .4byte SecretBase_RedCave3_MapEvents - .4byte SecretBase_RedCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json new file mode 100644 index 0000000000..ca5f00d6aa --- /dev/null +++ b/data/maps/SecretBase_RedCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE3", + "name": "SecretBase_RedCave3", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 12, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc deleted file mode 100644 index 9e29c6bcc0..0000000000 --- a/data/maps/SecretBase_RedCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave4_MapWarps: - warp_def 2, 12, 0, 126, MAP_NONE - -SecretBase_RedCave4_MapEvents:: - map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc deleted file mode 100644 index 7454f02511..0000000000 --- a/data/maps/SecretBase_RedCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave4: - .4byte SecretBase_RedCave4_Layout - .4byte SecretBase_RedCave4_MapEvents - .4byte SecretBase_RedCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json new file mode 100644 index 0000000000..6fe94e6bb6 --- /dev/null +++ b/data/maps/SecretBase_RedCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE4", + "name": "SecretBase_RedCave4", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 2, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc deleted file mode 100644 index 89c8329692..0000000000 --- a/data/maps/SecretBase_Shrub1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Shrub1_MapEvents:: - map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc deleted file mode 100644 index 76bfd45069..0000000000 --- a/data/maps/SecretBase_Shrub1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub1: - .4byte SecretBase_Shrub1_Layout - .4byte SecretBase_Shrub1_MapEvents - .4byte SecretBase_Shrub1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json new file mode 100644 index 0000000000..7f7dedc1cc --- /dev/null +++ b/data/maps/SecretBase_Shrub1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB1", + "name": "SecretBase_Shrub1", + "layout": "LAYOUT_SECRET_BASE_SHRUB1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc deleted file mode 100644 index 6e1f4ee8c3..0000000000 --- a/data/maps/SecretBase_Shrub2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub2_MapWarps: - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_Shrub2_MapEvents:: - map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc deleted file mode 100644 index 53faf2d72d..0000000000 --- a/data/maps/SecretBase_Shrub2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub2: - .4byte SecretBase_Shrub2_Layout - .4byte SecretBase_Shrub2_MapEvents - .4byte SecretBase_Shrub2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json new file mode 100644 index 0000000000..0be1b06f1e --- /dev/null +++ b/data/maps/SecretBase_Shrub2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB2", + "name": "SecretBase_Shrub2", + "layout": "LAYOUT_SECRET_BASE_SHRUB2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc deleted file mode 100644 index 38408df635..0000000000 --- a/data/maps/SecretBase_Shrub3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub3_MapWarps: - warp_def 6, 9, 0, 126, MAP_NONE - -SecretBase_Shrub3_MapEvents:: - map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc deleted file mode 100644 index 4692a00608..0000000000 --- a/data/maps/SecretBase_Shrub3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub3: - .4byte SecretBase_Shrub3_Layout - .4byte SecretBase_Shrub3_MapEvents - .4byte SecretBase_Shrub3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json new file mode 100644 index 0000000000..7104bf5a2e --- /dev/null +++ b/data/maps/SecretBase_Shrub3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB3", + "name": "SecretBase_Shrub3", + "layout": "LAYOUT_SECRET_BASE_SHRUB3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc deleted file mode 100644 index 1ebe8a0e82..0000000000 --- a/data/maps/SecretBase_Shrub4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub4_MapWarps: - warp_def 11, 8, 0, 126, MAP_NONE - -SecretBase_Shrub4_MapEvents:: - map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc deleted file mode 100644 index 2b0186878a..0000000000 --- a/data/maps/SecretBase_Shrub4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub4: - .4byte SecretBase_Shrub4_Layout - .4byte SecretBase_Shrub4_MapEvents - .4byte SecretBase_Shrub4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json new file mode 100644 index 0000000000..15b39293d9 --- /dev/null +++ b/data/maps/SecretBase_Shrub4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB4", + "name": "SecretBase_Shrub4", + "layout": "LAYOUT_SECRET_BASE_SHRUB4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 11, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc deleted file mode 100644 index 6ed26cb27b..0000000000 --- a/data/maps/SecretBase_Tree1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Tree1_MapEvents:: - map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc deleted file mode 100644 index 8cace4cef6..0000000000 --- a/data/maps/SecretBase_Tree1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree1: - .4byte SecretBase_Tree1_Layout - .4byte SecretBase_Tree1_MapEvents - .4byte SecretBase_Tree1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json new file mode 100644 index 0000000000..a03a38cde3 --- /dev/null +++ b/data/maps/SecretBase_Tree1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE1", + "name": "SecretBase_Tree1", + "layout": "LAYOUT_SECRET_BASE_TREE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc deleted file mode 100644 index 46b268c372..0000000000 --- a/data/maps/SecretBase_Tree2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree2_MapWarps: - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_Tree2_MapEvents:: - map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc deleted file mode 100644 index 7f286a94f5..0000000000 --- a/data/maps/SecretBase_Tree2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree2: - .4byte SecretBase_Tree2_Layout - .4byte SecretBase_Tree2_MapEvents - .4byte SecretBase_Tree2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json new file mode 100644 index 0000000000..484096be1a --- /dev/null +++ b/data/maps/SecretBase_Tree2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE2", + "name": "SecretBase_Tree2", + "layout": "LAYOUT_SECRET_BASE_TREE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc deleted file mode 100644 index 8512b4e317..0000000000 --- a/data/maps/SecretBase_Tree3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree3_MapWarps: - warp_def 8, 6, 0, 126, MAP_NONE - -SecretBase_Tree3_MapEvents:: - map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc deleted file mode 100644 index 6794908751..0000000000 --- a/data/maps/SecretBase_Tree3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree3: - .4byte SecretBase_Tree3_Layout - .4byte SecretBase_Tree3_MapEvents - .4byte SecretBase_Tree3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json new file mode 100644 index 0000000000..c1015dd9c0 --- /dev/null +++ b/data/maps/SecretBase_Tree3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE3", + "name": "SecretBase_Tree3", + "layout": "LAYOUT_SECRET_BASE_TREE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 8, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc deleted file mode 100644 index ed0f8b2360..0000000000 --- a/data/maps/SecretBase_Tree4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree4_MapWarps: - warp_def 7, 12, 0, 126, MAP_NONE - -SecretBase_Tree4_MapEvents:: - map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc deleted file mode 100644 index ff2605f406..0000000000 --- a/data/maps/SecretBase_Tree4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree4: - .4byte SecretBase_Tree4_Layout - .4byte SecretBase_Tree4_MapEvents - .4byte SecretBase_Tree4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json new file mode 100644 index 0000000000..297834653a --- /dev/null +++ b/data/maps/SecretBase_Tree4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE4", + "name": "SecretBase_Tree4", + "layout": "LAYOUT_SECRET_BASE_TREE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc deleted file mode 100644 index 6464c48543..0000000000 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave1_MapEvents:: - map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc deleted file mode 100644 index 642db55f51..0000000000 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave1: - .4byte SecretBase_YellowCave1_Layout - .4byte SecretBase_YellowCave1_MapEvents - .4byte SecretBase_YellowCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json new file mode 100644 index 0000000000..0cc46d97e6 --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE1", + "name": "SecretBase_YellowCave1", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc deleted file mode 100644 index 99bcee17dc..0000000000 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave2_MapWarps: - warp_def 12, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave2_MapEvents:: - map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc deleted file mode 100644 index ae0cd73bc4..0000000000 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave2: - .4byte SecretBase_YellowCave2_Layout - .4byte SecretBase_YellowCave2_MapEvents - .4byte SecretBase_YellowCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json new file mode 100644 index 0000000000..9660114afc --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE2", + "name": "SecretBase_YellowCave2", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 12, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc deleted file mode 100644 index 10bbfac8da..0000000000 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave3_MapWarps: - warp_def 5, 9, 0, 126, MAP_NONE - -SecretBase_YellowCave3_MapEvents:: - map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc deleted file mode 100644 index 39008b2b30..0000000000 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave3: - .4byte SecretBase_YellowCave3_Layout - .4byte SecretBase_YellowCave3_MapEvents - .4byte SecretBase_YellowCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json new file mode 100644 index 0000000000..fbc6d6217d --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE3", + "name": "SecretBase_YellowCave3", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc deleted file mode 100644 index 9afc932970..0000000000 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave4_MapWarps: - warp_def 6, 12, 0, 126, MAP_NONE - -SecretBase_YellowCave4_MapEvents:: - map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc deleted file mode 100644 index 24e10379b9..0000000000 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave4: - .4byte SecretBase_YellowCave4_Layout - .4byte SecretBase_YellowCave4_MapEvents - .4byte SecretBase_YellowCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json new file mode 100644 index 0000000000..d91c2f9a3a --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE4", + "name": "SecretBase_YellowCave4", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc deleted file mode 100644 index 8fa935974c..0000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc deleted file mode 100644 index 12d853e7a9..0000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideEntranceRoom: - .4byte ShoalCave_HighTideEntranceRoom_Layout - .4byte ShoalCave_HighTideEntranceRoom_MapEvents - .4byte ShoalCave_HighTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json new file mode 100644 index 0000000000..046fe49668 --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_HighTideEntranceRoom", + "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc deleted file mode 100644 index 96d1e9d5e1..0000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc deleted file mode 100644 index cdee5935a6..0000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideInnerRoom: - .4byte ShoalCave_HighTideInnerRoom_Layout - .4byte ShoalCave_HighTideInnerRoom_MapEvents - .4byte ShoalCave_HighTideInnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json new file mode 100644 index 0000000000..ff2231d67c --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "name": "ShoalCave_HighTideInnerRoom", + "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc deleted file mode 100644 index 39b462ba8b..0000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ShoalCave_LowTideEntranceRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 - -ShoalCave_LowTideEntranceRoom_MapWarps: - warp_def 20, 30, 3, 0, MAP_ROUTE125 - warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - -ShoalCave_LowTideEntranceRoom_MapEvents:: - map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc deleted file mode 100644 index cf1600b531..0000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideEntranceRoom: - .4byte ShoalCave_LowTideEntranceRoom_Layout - .4byte ShoalCave_LowTideEntranceRoom_MapEvents - .4byte ShoalCave_LowTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json new file mode 100644 index 0000000000..477c1c5007 --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_LowTideEntranceRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0", + "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 18, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 20, + "y": 30, + "elevation": 3, + "dest_map": "MAP_ROUTE125", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 6 + }, + { + "x": 27, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index c596ba6875..6e0f4eddb2 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -8,11 +8,11 @@ ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 - setmaplayoutindex 168 + setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM end ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 - setmaplayoutindex 164 + setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM end ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc deleted file mode 100644 index 57c4f580be..0000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -ShoalCave_LowTideIceRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE - -ShoalCave_LowTideIceRoom_MapWarps: - warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - -ShoalCave_LowTideIceRoom_MapEvents:: - map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc deleted file mode 100644 index a05edf096a..0000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideIceRoom: - .4byte ShoalCave_LowTideIceRoom_Layout - .4byte ShoalCave_LowTideIceRoom_MapEvents - .4byte ShoalCave_LowTideIceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json new file mode 100644 index 0000000000..fd2e726801 --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "name": "ShoalCave_LowTideIceRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideIceRoom_EventScript_2913E7", + "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 21, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideIceRoom_EventScript_2913F4", + "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE" + } + ], + "warp_events": [ + { + "x": 17, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc deleted file mode 100644 index 8a4d0b7a98..0000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -ShoalCave_LowTideInnerRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY - -ShoalCave_LowTideInnerRoom_MapWarps: - warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - -ShoalCave_LowTideInnerRoom_MapBGEvents: - bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C - bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8 - bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA - bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FF6 - bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028 - bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A - -ShoalCave_LowTideInnerRoom_MapEvents:: - map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc deleted file mode 100644 index 431d599858..0000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideInnerRoom: - .4byte ShoalCave_LowTideInnerRoom_Layout - .4byte ShoalCave_LowTideInnerRoom_MapEvents - .4byte ShoalCave_LowTideInnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json new file mode 100644 index 0000000000..a7c276aa48 --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "name": "ShoalCave_LowTideInnerRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 14, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD", + "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY" + } + ], + "warp_events": [ + { + "x": 34, + "y": 29, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 1 + }, + { + "x": 38, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 14, + "elevation": 4, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 33, + "elevation": 5, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 2 + }, + { + "x": 40, + "y": 33, + "elevation": 5, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 31, + "y": 8, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C" + }, + { + "type": "sign", + "x": 14, + "y": 26, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8" + }, + { + "type": "sign", + "x": 41, + "y": 20, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA" + }, + { + "type": "sign", + "x": 41, + "y": 10, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_237028" + }, + { + "type": "sign", + "x": 16, + "y": 13, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A" + } + ] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 65bdd73b83..c54aa1d4ff 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -8,11 +8,11 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 goto ShoalCave_LowTideInnerRoom_EventScript_236F12 ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E - setmaplayoutindex 169 + setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM end ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12 - setmaplayoutindex 165 + setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM end ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc deleted file mode 100644 index 226f351e4c..0000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -ShoalCave_LowTideLowerRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 - -ShoalCave_LowTideLowerRoom_MapWarps: - warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM - -ShoalCave_LowTideLowerRoom_MapBGEvents: - bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 - -ShoalCave_LowTideLowerRoom_MapEvents:: - map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc deleted file mode 100644 index 490825d06d..0000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideLowerRoom: - .4byte ShoalCave_LowTideLowerRoom_Layout - .4byte ShoalCave_LowTideLowerRoom_MapEvents - .4byte ShoalCave_LowTideLowerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json new file mode 100644 index 0000000000..5c399ed538 --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "name": "ShoalCave_LowTideLowerRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 25, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 4 + }, + { + "x": 19, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 5 + }, + { + "x": 28, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 18, + "y": 2, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideLowerRoom_EventScript_237176" + } + ] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc deleted file mode 100644 index 640d153f7a..0000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ShoalCave_LowTideStairsRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL - -ShoalCave_LowTideStairsRoom_MapWarps: - warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - -ShoalCave_LowTideStairsRoom_MapBGEvents: - bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A - -ShoalCave_LowTideStairsRoom_MapEvents:: - map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc deleted file mode 100644 index 3454cf1f64..0000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideStairsRoom: - .4byte ShoalCave_LowTideStairsRoom_Layout - .4byte ShoalCave_LowTideStairsRoom_MapEvents - .4byte ShoalCave_LowTideStairsRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json new file mode 100644 index 0000000000..e4ad65f52d --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "name": "ShoalCave_LowTideStairsRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideStairsRoom_EventScript_2913DA", + "flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 11, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A" + } + ] +} \ No newline at end of file diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc deleted file mode 100644 index cc422090e9..0000000000 --- a/data/maps/SingleBattleColosseum/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SingleBattleColosseum_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 - -SingleBattleColosseum_MapWarps: - warp_def 6, 8, 3, 127, MAP_NONE - warp_def 7, 8, 3, 127, MAP_NONE - -SingleBattleColosseum_MapCoordEvents: - coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 - coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E - -SingleBattleColosseum_MapEvents:: - map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc deleted file mode 100644 index 9bf35edca8..0000000000 --- a/data/maps/SingleBattleColosseum/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SingleBattleColosseum: - .4byte SingleBattleColosseum_Layout - .4byte SingleBattleColosseum_MapEvents - .4byte SingleBattleColosseum_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_SINGLE_BATTLE_COLOSSEUM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json new file mode 100644 index 0000000000..a2cc78b2f2 --- /dev/null +++ b/data/maps/SingleBattleColosseum/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SINGLE_BATTLE_COLOSSEUM", + "name": "SingleBattleColosseum", + "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SingleBattleColosseum_EventScript_2774A6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277374" + }, + { + "type": "trigger", + "x": 10, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827737E" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc deleted file mode 100644 index eb6f98b7d0..0000000000 --- a/data/maps/SkyPillar_1F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_1F_MapWarps: - warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE - warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE - warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F - -SkyPillar_1F_MapEvents:: - map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc deleted file mode 100644 index 83082ecc05..0000000000 --- a/data/maps/SkyPillar_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_1F: - .4byte SkyPillar_1F_Layout - .4byte SkyPillar_1F_MapEvents - .4byte SkyPillar_1F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_1F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json new file mode 100644 index 0000000000..3d1fbf51ad --- /dev/null +++ b/data/maps/SkyPillar_1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_1F", + "name": "SkyPillar_1F", + "layout": "LAYOUT_SKY_PILLAR_1F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 3d76a9fe22..2230dad8d2 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B end SkyPillar_1F_EventScript_239627:: @ 8239627 - setmaplayoutindex 433 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54 return diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc deleted file mode 100644 index 3b4b279152..0000000000 --- a/data/maps/SkyPillar_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_2F_MapWarps: - warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F - warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F - -SkyPillar_2F_MapEvents:: - map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc deleted file mode 100644 index 46141edca1..0000000000 --- a/data/maps/SkyPillar_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_2F: - .4byte SkyPillar_2F_Layout - .4byte SkyPillar_2F_MapEvents - .4byte SkyPillar_2F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_2F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json new file mode 100644 index 0000000000..1e543db403 --- /dev/null +++ b/data/maps/SkyPillar_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_2F", + "name": "SkyPillar_2F", + "layout": "LAYOUT_SKY_PILLAR_2F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 0474a829c3..fa89f3893c 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B end SkyPillar_2F_EventScript_23964C:: @ 823964C - setmaplayoutindex 434 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC return SkyPillar_2F_MapScript1_239650: @ 8239650 diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc deleted file mode 100644 index 8e3f498dc8..0000000000 --- a/data/maps/SkyPillar_3F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_3F_MapWarps: - warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F - warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F - warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F - -SkyPillar_3F_MapEvents:: - map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc deleted file mode 100644 index 9b4ab53f02..0000000000 --- a/data/maps/SkyPillar_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_3F: - .4byte SkyPillar_3F_Layout - .4byte SkyPillar_3F_MapEvents - .4byte SkyPillar_3F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_3F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json new file mode 100644 index 0000000000..56a85256f9 --- /dev/null +++ b/data/maps/SkyPillar_3F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_3F", + "name": "SkyPillar_3F", + "layout": "LAYOUT_SKY_PILLAR_3F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_2F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 777d53b628..015d754eb8 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661 end SkyPillar_3F_EventScript_23966D:: @ 823966D - setmaplayoutindex 435 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4 return diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc deleted file mode 100644 index ce0cdd2e37..0000000000 --- a/data/maps/SkyPillar_4F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_4F_MapWarps: - warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F - warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F - warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F - -SkyPillar_4F_MapEvents:: - map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc deleted file mode 100644 index be6e9e66ad..0000000000 --- a/data/maps/SkyPillar_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_4F: - .4byte SkyPillar_4F_Layout - .4byte SkyPillar_4F_MapEvents - .4byte SkyPillar_4F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_4F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json new file mode 100644 index 0000000000..babc00f6c6 --- /dev/null +++ b/data/maps/SkyPillar_4F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_4F", + "name": "SkyPillar_4F", + "layout": "LAYOUT_SKY_PILLAR_4F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_5F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 2624921695..ccab2453c8 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681 end SkyPillar_4F_EventScript_239692:: @ 8239692 - setmaplayoutindex 436 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C return SkyPillar_4F_MapScript1_239696: @ 8239696 diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc deleted file mode 100644 index b3ad7b0f79..0000000000 --- a/data/maps/SkyPillar_5F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_5F_MapWarps: - warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F - warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP - -SkyPillar_5F_MapEvents:: - map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc deleted file mode 100644 index 8fa59173bb..0000000000 --- a/data/maps/SkyPillar_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_5F: - .4byte SkyPillar_5F_Layout - .4byte SkyPillar_5F_MapEvents - .4byte SkyPillar_5F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_5F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json new file mode 100644 index 0000000000..233e86dfee --- /dev/null +++ b/data/maps/SkyPillar_5F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_5F", + "name": "SkyPillar_5F", + "layout": "LAYOUT_SKY_PILLAR_5F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_TOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 41546899f8..b3e3f6605f 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 - setmaplayoutindex 437 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4 return diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc deleted file mode 100644 index ca0647e3ff..0000000000 --- a/data/maps/SkyPillar_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_Entrance_MapWarps: - warp_def 6, 16, 3, 0, MAP_ROUTE131 - warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE - -SkyPillar_Entrance_MapEvents:: - map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc deleted file mode 100644 index 5326495a63..0000000000 --- a/data/maps/SkyPillar_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Entrance: - .4byte SkyPillar_Entrance_Layout - .4byte SkyPillar_Entrance_MapEvents - .4byte SkyPillar_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_ENTRANCE - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json new file mode 100644 index 0000000000..379d6fcfb3 --- /dev/null +++ b/data/maps/SkyPillar_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_ENTRANCE", + "name": "SkyPillar_Entrance", + "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE131", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc deleted file mode 100644 index 90de89d64a..0000000000 --- a/data/maps/SkyPillar_Outside/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SkyPillar_Outside_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE - -SkyPillar_Outside_MapWarps: - warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE - warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F - -SkyPillar_Outside_MapEvents:: - map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc deleted file mode 100644 index 3b60eaef2c..0000000000 --- a/data/maps/SkyPillar_Outside/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Outside: - .4byte SkyPillar_Outside_Layout - .4byte SkyPillar_Outside_MapEvents - .4byte SkyPillar_Outside_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_OUTSIDE - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json new file mode 100644 index 0000000000..dd76c1d32f --- /dev/null +++ b/data/maps/SkyPillar_Outside/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SKY_PILLAR_OUTSIDE", + "name": "SkyPillar_Outside", + "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SkyPillar_Outside_EventScript_2393F8", + "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE" + } + ], + "warp_events": [ + { + "x": 17, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SKY_PILLAR_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc deleted file mode 100644 index 23edf5bb26..0000000000 --- a/data/maps/SkyPillar_Top/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SkyPillar_Top_EventObjects: - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT - -SkyPillar_Top_MapWarps: - warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F - -SkyPillar_Top_MapCoordEvents: - coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A - -SkyPillar_Top_MapEvents:: - map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 - diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc deleted file mode 100644 index a4ab735e05..0000000000 --- a/data/maps/SkyPillar_Top/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Top: - .4byte SkyPillar_Top_Layout - .4byte SkyPillar_Top_MapEvents - .4byte SkyPillar_Top_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_TOP - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json new file mode 100644 index 0000000000..0d53a80be5 --- /dev/null +++ b/data/maps/SkyPillar_Top/map.json @@ -0,0 +1,65 @@ +{ + "id": "MAP_SKY_PILLAR_TOP", + "name": "SkyPillar_Top", + "layout": "LAYOUT_SKY_PILLAR_TOP", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_1", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SkyPillar_Top_EventScript_239722", + "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT" + } + ], + "warp_events": [ + { + "x": 16, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 9, + "elevation": 3, + "var": "VAR_0x40D7", + "var_value": 0, + "script": "SkyPillar_Top_EventScript_23979A" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index c091991a32..f764ea79c1 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD - setmaplayoutindex 438 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc deleted file mode 100644 index 09e0b790aa..0000000000 --- a/data/maps/SlateportCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SlateportCity_MapConnectionsList: - connection up, 0, MAP_ROUTE110 - connection down, 0, MAP_ROUTE109 - connection right, 0, MAP_ROUTE134 - -SlateportCity_MapConnections: - .4byte 3 - .4byte SlateportCity_MapConnectionsList - diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc deleted file mode 100644 index ce576927c9..0000000000 --- a/data/maps/SlateportCity/events.inc +++ /dev/null @@ -1,71 +0,0 @@ -SlateportCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 - object_event 14, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 - object_event 15, EVENT_OBJ_GFX_MAN_3, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 - object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 - object_event 22, EVENT_OBJ_GFX_MAN_5, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - object_event 25, EVENT_OBJ_GFX_POKEFAN_M, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT - -SlateportCity_MapWarps: - warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART - warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F - warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY - warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB - warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1 - warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR - warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR - warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 - -SlateportCity_MapCoordEvents: - coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC - -SlateportCity_MapBGEvents: - bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2 - bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 - bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 - bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A - bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF94 - bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A - bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF8B - bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF79 - bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF82 - bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF70 - bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF36 - bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F - bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643 - -SlateportCity_MapEvents:: - map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents - diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc deleted file mode 100644 index 3a6e145342..0000000000 --- a/data/maps/SlateportCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity: - .4byte SlateportCity_Layout - .4byte SlateportCity_MapEvents - .4byte SlateportCity_MapScripts - .4byte SlateportCity_MapConnections - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json new file mode 100644 index 0000000000..52f2f64127 --- /dev/null +++ b/data/maps/SlateportCity/map.json @@ -0,0 +1,685 @@ +{ + "id": "MAP_SLATEPORT_CITY", + "name": "SlateportCity", + "layout": "LAYOUT_SLATEPORT_CITY", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE110" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE109" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE134" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCED9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 34, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCEF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCEB8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 26, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCF17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 31, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD009", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 5, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE42", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 20, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE63", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 8, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 29, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD353", + "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD35C", + "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 28, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD1F8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 37, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFE5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 28, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFEE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 9, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFF7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 16, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD000", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFBB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFDC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD020", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 29, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD037", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 6, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD198", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 5, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD16A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 34, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD365", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCDE4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 11, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD1D8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 5, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCDBD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 22, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD04E", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD065", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 24, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD07C", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD093", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD0AA", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 26, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD0C1", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 28, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD14A", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 25, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD153", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 11, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD36E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 10, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 19, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "dest_warp_id": 0 + }, + { + "x": 30, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 40, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HARBOR", + "dest_warp_id": 2 + }, + { + "x": 21, + "y": 44, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x40D2", + "var_value": 2, + "script": "SlateportCity_EventScript_1DD5DC" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCFB2" + }, + { + "type": "sign", + "x": 20, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 21, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 14, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 24, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF94" + }, + { + "type": "sign", + "x": 15, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 14, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF8B" + }, + { + "type": "sign", + "x": 26, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF79" + }, + { + "type": "sign", + "x": 16, + "y": 22, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF82" + }, + { + "type": "sign", + "x": 8, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF70" + }, + { + "type": "sign", + "x": 7, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF36" + }, + { + "type": "sign", + "x": 23, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF3F" + }, + { + "type": "sign", + "x": 10, + "y": 36, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_1DD643" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc deleted file mode 100644 index 2dae031383..0000000000 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SlateportCity_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -SlateportCity_BattleTentBattleRoom_MapEvents:: - map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc deleted file mode 100644 index ff2970197c..0000000000 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentBattleRoom: - .4byte BattleTentBattleRoom_Layout - .4byte SlateportCity_BattleTentBattleRoom_MapEvents - .4byte SlateportCity_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json new file mode 100644 index 0000000000..ed9a8866c3 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM", + "name": "SlateportCity_BattleTentBattleRoom", + "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc deleted file mode 100644 index f165ab2fa1..0000000000 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -SlateportCity_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -SlateportCity_BattleTentCorridor_MapEvents:: - map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc deleted file mode 100644 index d1e0a8911b..0000000000 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte SlateportCity_BattleTentCorridor_MapEvents - .4byte SlateportCity_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json new file mode 100644 index 0000000000..d5e2d5e379 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR", + "name": "SlateportCity_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc deleted file mode 100644 index 81a3499ec4..0000000000 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SlateportCity_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 - -SlateportCity_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY - warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY - -SlateportCity_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 - -SlateportCity_BattleTentLobby_MapEvents:: - map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents - diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc deleted file mode 100644 index 8b9df581e8..0000000000 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte SlateportCity_BattleTentLobby_MapEvents - .4byte SlateportCity_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json new file mode 100644 index 0000000000..07af8ad738 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", + "name": "SlateportCity_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_2088AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A7E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A90", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_BattleTentLobby_EventScript_208A99" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc deleted file mode 100644 index 7984e29925..0000000000 --- a/data/maps/SlateportCity_Harbor/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -SlateportCity_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW - -SlateportCity_Harbor_MapWarps: - warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY - warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY - warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY - warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY - -SlateportCity_Harbor_MapCoordEvents: - coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB - coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7 - coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3 - coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF - -SlateportCity_Harbor_MapEvents:: - map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 - diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc deleted file mode 100644 index 24b39a88fb..0000000000 --- a/data/maps/SlateportCity_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_Harbor: - .4byte Harbor_Layout - .4byte SlateportCity_Harbor_MapEvents - .4byte SlateportCity_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HARBOR - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json new file mode 100644 index 0000000000..a48b6a82f2 --- /dev/null +++ b/data/maps/SlateportCity_Harbor/map.json @@ -0,0 +1,191 @@ +{ + "id": "MAP_SLATEPORT_CITY_HARBOR", + "name": "SlateportCity_Harbor", + "layout": "LAYOUT_HARBOR", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CAF1", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CC52", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CC99", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CCA2", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "x": 7, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW" + } + ], + "warp_events": [ + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 8 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 8 + }, + { + "x": 19, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 9 + }, + { + "x": 20, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 11, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9BB" + }, + { + "type": "trigger", + "x": 8, + "y": 12, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9C7" + }, + { + "type": "trigger", + "x": 8, + "y": 13, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9D3" + }, + { + "type": "trigger", + "x": 8, + "y": 14, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9DF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc deleted file mode 100644 index a5fcfba7e8..0000000000 --- a/data/maps/SlateportCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SlateportCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 - -SlateportCity_House1_MapWarps: - warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY - -SlateportCity_House1_MapEvents:: - map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc deleted file mode 100644 index 2673a37168..0000000000 --- a/data/maps/SlateportCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_House1: - .4byte HouseWithBed_Layout - .4byte SlateportCity_House1_MapEvents - .4byte SlateportCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json new file mode 100644 index 0000000000..b1eed10274 --- /dev/null +++ b/data/maps/SlateportCity_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SLATEPORT_CITY_HOUSE1", + "name": "SlateportCity_House1", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House1_EventScript_209AA5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc deleted file mode 100644 index eba48e548d..0000000000 --- a/data/maps/SlateportCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SlateportCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 - -SlateportCity_House2_MapWarps: - warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY - -SlateportCity_House2_MapEvents:: - map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc deleted file mode 100644 index 0e756ee4a6..0000000000 --- a/data/maps/SlateportCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_House2: - .4byte House2_Layout - .4byte SlateportCity_House2_MapEvents - .4byte SlateportCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json new file mode 100644 index 0000000000..24ae6e67d0 --- /dev/null +++ b/data/maps/SlateportCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SLATEPORT_CITY_HOUSE2", + "name": "SlateportCity_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House2_EventScript_20D9AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House2_EventScript_20D9B8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc deleted file mode 100644 index a6d872630c..0000000000 --- a/data/maps/SlateportCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SlateportCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 - -SlateportCity_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY - -SlateportCity_Mart_MapEvents:: - map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc deleted file mode 100644 index a98e7bb902..0000000000 --- a/data/maps/SlateportCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_Mart: - .4byte Mart_Layout - .4byte SlateportCity_Mart_MapEvents - .4byte SlateportCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json new file mode 100644 index 0000000000..cec96e59ff --- /dev/null +++ b/data/maps/SlateportCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SLATEPORT_CITY_MART", + "name": "SlateportCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC49", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC76", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC7F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc deleted file mode 100644 index 254506300f..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -SlateportCity_OceanicMuseum_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - -SlateportCity_OceanicMuseum_1F_MapWarps: - warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY - warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY - warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F - -SlateportCity_OceanicMuseum_1F_MapCoordEvents: - coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F - coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 - -SlateportCity_OceanicMuseum_1F_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 - bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7 - bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0 - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9 - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - -SlateportCity_OceanicMuseum_1F_MapEvents:: - map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc deleted file mode 100644 index 0bf69b52a1..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_1F: - .4byte SlateportCity_OceanicMuseum_1F_Layout - .4byte SlateportCity_OceanicMuseum_1F_MapEvents - .4byte SlateportCity_OceanicMuseum_1F_MapScripts - .4byte 0x0 - .2byte MUS_FUNE_KAN - .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json new file mode 100644 index 0000000000..7202fc35ae --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -0,0 +1,349 @@ +{ + "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "name": "SlateportCity_OceanicMuseum_1F", + "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "music": "MUS_FUNE_KAN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + } + ], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 5 + }, + { + "x": 10, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 3, + "var": "VAR_0x40AA", + "var_value": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" + }, + { + "type": "trigger", + "x": 10, + "y": 7, + "elevation": 3, + "var": "VAR_0x40AA", + "var_value": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE83" + }, + { + "type": "sign", + "x": 2, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE8C" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + }, + { + "type": "sign", + "x": 13, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + }, + { + "type": "sign", + "x": 15, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEA7" + }, + { + "type": "sign", + "x": 18, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB0" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB9" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + }, + { + "type": "sign", + "x": 17, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc deleted file mode 100644 index b1cd4477a8..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -SlateportCity_OceanicMuseum_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 - object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - -SlateportCity_OceanicMuseum_2F_MapWarps: - warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - -SlateportCity_OceanicMuseum_2F_MapBGEvents: - bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 - bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - -SlateportCity_OceanicMuseum_2F_MapEvents:: - map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents - diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc deleted file mode 100644 index 8212c6be59..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_2F: - .4byte SlateportCity_OceanicMuseum_2F_Layout - .4byte SlateportCity_OceanicMuseum_2F_MapEvents - .4byte SlateportCity_OceanicMuseum_2F_MapScripts - .4byte 0x0 - .2byte MUS_FUNE_KAN - .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json new file mode 100644 index 0000000000..dbb46dbfce --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "name": "SlateportCity_OceanicMuseum_2F", + "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "music": "MUS_FUNE_KAN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 18, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD0A" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD13" + }, + { + "type": "sign", + "x": 4, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + }, + { + "type": "sign", + "x": 4, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + }, + { + "type": "sign", + "x": 3, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 2, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 4, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 13, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + }, + { + "type": "sign", + "x": 14, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + }, + { + "type": "sign", + "x": 18, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + }, + { + "type": "sign", + "x": 19, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + }, + { + "type": "sign", + "x": 15, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + }, + { + "type": "sign", + "x": 13, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 4, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 79442b1aab..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SlateportCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 - -SlateportCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY - warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY - warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F - -SlateportCity_PokemonCenter_1F_MapEvents:: - map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc deleted file mode 100644 index aee6e2e1cc..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte SlateportCity_PokemonCenter_1F_MapEvents - .4byte SlateportCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..eecc722481 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "name": "SlateportCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 34f7fe078d..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -SlateportCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -SlateportCity_PokemonCenter_2F_MapEvents:: - map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bc9640581f..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte SlateportCity_PokemonCenter_2F_MapEvents - .4byte SlateportCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..e12efc0f07 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", + "name": "SlateportCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc deleted file mode 100644 index 861d9cb62a..0000000000 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SlateportCity_PokemonFanClub_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 - -SlateportCity_PokemonFanClub_MapWarps: - warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY - warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY - -SlateportCity_PokemonFanClub_MapEvents:: - map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc deleted file mode 100644 index 29e6816a3e..0000000000 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonFanClub: - .4byte SlateportCity_PokemonFanClub_Layout - .4byte SlateportCity_PokemonFanClub_MapEvents - .4byte SlateportCity_PokemonFanClub_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json new file mode 100644 index 0000000000..e41bee0fdb --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "name": "SlateportCity_PokemonFanClub", + "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 11, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 11, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_28C943", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A17E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_209E96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A20D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A220", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 11, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc deleted file mode 100644 index 052ccd9659..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_SternsShipyard_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - -SlateportCity_SternsShipyard_1F_MapWarps: - warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY - warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY - warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F - -SlateportCity_SternsShipyard_1F_MapEvents:: - map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc deleted file mode 100644 index 3731923e2d..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_1F: - .4byte SlateportCity_SternsShipyard_1F_Layout - .4byte SlateportCity_SternsShipyard_1F_MapEvents - .4byte SlateportCity_SternsShipyard_1F_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json new file mode 100644 index 0000000000..8497f4212a --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "name": "SlateportCity_SternsShipyard_1F", + "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF", + "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY" + } + ], + "warp_events": [ + { + "x": 2, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc deleted file mode 100644 index 2e48eb8b4d..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SlateportCity_SternsShipyard_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 - -SlateportCity_SternsShipyard_2F_MapWarps: - warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F - -SlateportCity_SternsShipyard_2F_MapEvents:: - map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc deleted file mode 100644 index 094f9fdec1..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_2F: - .4byte SlateportCity_SternsShipyard_2F_Layout - .4byte SlateportCity_SternsShipyard_2F_MapEvents - .4byte SlateportCity_SternsShipyard_2F_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json new file mode 100644 index 0000000000..025d97f9a0 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "name": "SlateportCity_SternsShipyard_2F", + "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_2F_EventScript_208647", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity/connections.inc b/data/maps/SootopolisCity/connections.inc deleted file mode 100644 index 230f56b2ef..0000000000 --- a/data/maps/SootopolisCity/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SootopolisCity_MapConnectionsList:: @ 84867F0 - @ empty - -SootopolisCity_MapConnections:: @ 84867F0 - .4byte 0 - .4byte SootopolisCity_MapConnectionsList diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc deleted file mode 100644 index 6592c293d9..0000000000 --- a/data/maps/SootopolisCity/events.inc +++ /dev/null @@ -1,46 +0,0 @@ -SootopolisCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 - object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - -SootopolisCity_MapWarps: - warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART - warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F - warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE - warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1 - warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2 - warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3 - warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4 - warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5 - warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6 - warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7 - warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - -SootopolisCity_MapBGEvents: - bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B - bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A - bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 - bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 - bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A - bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154 - -SootopolisCity_MapEvents:: - map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents - diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc deleted file mode 100644 index 0d12af500a..0000000000 --- a/data/maps/SootopolisCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity: - .4byte SootopolisCity_Layout - .4byte SootopolisCity_MapEvents - .4byte SootopolisCity_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json new file mode 100644 index 0000000000..88ca51ff74 --- /dev/null +++ b/data/maps/SootopolisCity/map.json @@ -0,0 +1,396 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY", + "name": "SootopolisCity", + "layout": "LAYOUT_SOOTOPOLIS_CITY", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5E8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 47, + "y": 33, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5FE2", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 9, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5ED8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 51, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E608E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 43, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E60E3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 26, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6017", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 20, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6166", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 49, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6038", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_3", + "x": 28, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_3", + "x": 34, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "x": 31, + "y": 41, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 17, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6411", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 14, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E63DB", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 17, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6393", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 19, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E635D", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 29, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E64F2", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 31, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E651F", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6446", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE" + } + ], + "warp_events": [ + { + "x": 43, + "y": 31, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 29, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 32, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 16, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE5", + "dest_warp_id": 0 + }, + { + "x": 53, + "y": 28, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE6", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 35, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE7", + "dest_warp_id": 0 + }, + { + "x": 48, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 51, + "y": 36, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 33, + "y": 34, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_EventScript_1E614B" + }, + { + "type": "sign", + "x": 19, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 44, + "y": 31, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 45, + "y": 31, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 18, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 41, + "y": 37, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_EventScript_1E6154" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index a116aeb568..5e212ddfe4 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800 return SootopolisCity_EventScript_1E5801:: @ 81E5801 - setmaplayoutindex 357 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200 return SootopolisCity_EventScript_1E5805:: @ 81E5805 diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc deleted file mode 100644 index 288d78343a..0000000000 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SootopolisCity_Gym_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 - -SootopolisCity_Gym_1F_MapWarps: - warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY - warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY - warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F - -SootopolisCity_Gym_1F_MapBGEvents: - bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F - bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F - -SootopolisCity_Gym_1F_MapEvents:: - map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents - diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc deleted file mode 100644 index 72e6fd2c81..0000000000 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_1F: - .4byte SootopolisCity_Gym_1F_Layout - .4byte SootopolisCity_Gym_1F_MapEvents - .4byte SootopolisCity_Gym_1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json new file mode 100644 index 0000000000..6c1e4374d2 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -0,0 +1,86 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "name": "SootopolisCity_Gym_1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_JUAN", + "x": 8, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Gym_1F_EventScript_224F44", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 7, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Gym_1F_EventScript_225040", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_Gym_1F_EventScript_22505F" + }, + { + "type": "sign", + "x": 10, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_Gym_1F_EventScript_22506F" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc deleted file mode 100644 index 2ef2609e7e..0000000000 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SootopolisCity_Gym_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 - object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 - object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 - -SootopolisCity_Gym_B1F_MapWarps: - warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F - -SootopolisCity_Gym_B1F_MapEvents:: - map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc deleted file mode 100644 index afa12fa9f2..0000000000 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_B1F: - .4byte SootopolisCity_Gym_B1F_Layout - .4byte SootopolisCity_Gym_B1F_MapEvents - .4byte SootopolisCity_Gym_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_B1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json new file mode 100644 index 0000000000..663d7db847 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -0,0 +1,159 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", + "name": "SootopolisCity_Gym_B1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 7, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225C8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 9, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225CD0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225CB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 11, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SootopolisCity_Gym_B1F_EventScript_225CE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SootopolisCity_Gym_B1F_EventScript_225D15", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SootopolisCity_Gym_B1F_EventScript_225D2C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SootopolisCity_Gym_B1F_EventScript_225CA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225CFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225D5A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225D43", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc deleted file mode 100644 index 64012784a7..0000000000 --- a/data/maps/SootopolisCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 - -SootopolisCity_House1_MapWarps: - warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House1_MapEvents:: - map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc deleted file mode 100644 index af4cf939c4..0000000000 --- a/data/maps/SootopolisCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House1: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House1_MapEvents - .4byte SootopolisCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json new file mode 100644 index 0000000000..b5ecf4e411 --- /dev/null +++ b/data/maps/SootopolisCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", + "name": "SootopolisCity_House1", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House1_EventScript_22694D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House1_EventScript_22698E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc deleted file mode 100644 index ea70cecb97..0000000000 --- a/data/maps/SootopolisCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 - -SootopolisCity_House2_MapWarps: - warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House2_MapEvents:: - map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc deleted file mode 100644 index 42b7e14aa8..0000000000 --- a/data/maps/SootopolisCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House2: - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House2_MapEvents - .4byte SootopolisCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json new file mode 100644 index 0000000000..ea9d582848 --- /dev/null +++ b/data/maps/SootopolisCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", + "name": "SootopolisCity_House2", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House2_EventScript_226A77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc deleted file mode 100644 index d078de8ecc..0000000000 --- a/data/maps/SootopolisCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 - -SootopolisCity_House3_MapWarps: - warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House3_MapEvents:: - map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc deleted file mode 100644 index 0913505e13..0000000000 --- a/data/maps/SootopolisCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House3: - .4byte SootopolisCity_House3_Layout - .4byte SootopolisCity_House3_MapEvents - .4byte SootopolisCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json new file mode 100644 index 0000000000..765803e8a7 --- /dev/null +++ b/data/maps/SootopolisCity_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", + "name": "SootopolisCity_House3", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House3_EventScript_226B72", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House3_EventScript_226B9B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc deleted file mode 100644 index ce669cd756..0000000000 --- a/data/maps/SootopolisCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SootopolisCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 - -SootopolisCity_House4_MapWarps: - warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House4_MapEvents:: - map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc deleted file mode 100644 index 1266c68fec..0000000000 --- a/data/maps/SootopolisCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House4: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House4_MapEvents - .4byte SootopolisCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json new file mode 100644 index 0000000000..492aac1343 --- /dev/null +++ b/data/maps/SootopolisCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", + "name": "SootopolisCity_House4", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D16", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D1F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D28", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc deleted file mode 100644 index fa6d0452dd..0000000000 --- a/data/maps/SootopolisCity_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 - -SootopolisCity_House5_MapWarps: - warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House5_MapEvents:: - map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc deleted file mode 100644 index 0b1b3664ca..0000000000 --- a/data/maps/SootopolisCity_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House5: - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House5_MapEvents - .4byte SootopolisCity_House5_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json new file mode 100644 index 0000000000..24cdafe8bd --- /dev/null +++ b/data/maps/SootopolisCity_House5/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", + "name": "SootopolisCity_House5", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House5_EventScript_226E94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House5_EventScript_226E9D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc deleted file mode 100644 index c89c135386..0000000000 --- a/data/maps/SootopolisCity_House6/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House6_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 - -SootopolisCity_House6_MapWarps: - warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House6_MapEvents:: - map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc deleted file mode 100644 index 3268fbf09a..0000000000 --- a/data/maps/SootopolisCity_House6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House6: - .4byte SootopolisCity_House3_Layout - .4byte SootopolisCity_House6_MapEvents - .4byte SootopolisCity_House6_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json new file mode 100644 index 0000000000..d787c3e67d --- /dev/null +++ b/data/maps/SootopolisCity_House6/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", + "name": "SootopolisCity_House6", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House6_EventScript_226F5C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc deleted file mode 100644 index e978cb8d4f..0000000000 --- a/data/maps/SootopolisCity_House7/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House7_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 - -SootopolisCity_House7_MapWarps: - warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House7_MapEvents:: - map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc deleted file mode 100644 index 0398f1cf77..0000000000 --- a/data/maps/SootopolisCity_House7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House7: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House7_MapEvents - .4byte SootopolisCity_House7_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json new file mode 100644 index 0000000000..de04646828 --- /dev/null +++ b/data/maps/SootopolisCity_House7/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", + "name": "SootopolisCity_House7", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House7_EventScript_2270CC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House7_EventScript_2270D5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc deleted file mode 100644 index da5b123fe6..0000000000 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 - -SootopolisCity_LotadAndSeedotHouse_MapWarps: - warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY - -SootopolisCity_LotadAndSeedotHouse_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B - -SootopolisCity_LotadAndSeedotHouse_MapEvents:: - map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents - diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc deleted file mode 100644 index 35da7aa8bc..0000000000 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse: - .4byte SootopolisCity_LotadAndSeedotHouse_Layout - .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents - .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json new file mode 100644 index 0000000000..5f8acc9bb5 --- /dev/null +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "name": "SootopolisCity_LotadAndSeedotHouse", + "layout": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22734D" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22735B" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc deleted file mode 100644 index 0fb940fd9f..0000000000 --- a/data/maps/SootopolisCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SootopolisCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 - -SootopolisCity_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY - warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY - -SootopolisCity_Mart_MapEvents:: - map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc deleted file mode 100644 index 5b5ad1a01a..0000000000 --- a/data/maps/SootopolisCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Mart: - .4byte Mart_Layout - .4byte SootopolisCity_Mart_MapEvents - .4byte SootopolisCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json new file mode 100644 index 0000000000..bb031b2af7 --- /dev/null +++ b/data/maps/SootopolisCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MART", + "name": "SootopolisCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_226795", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_2267C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_2267EC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc deleted file mode 100644 index 560e693cf7..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 - -SootopolisCity_MysteryEventsHouse_1F_MapWarps: - warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY - warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY - warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F - -SootopolisCity_MysteryEventsHouse_1F_MapEvents:: - map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc deleted file mode 100644 index bf7d813210..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F: - .4byte SootopolisCity_MysteryEventsHouse_1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents - .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json new file mode 100644 index 0000000000..b57eae35c6 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "name": "SootopolisCity_MysteryEventsHouse_1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 12 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 12 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 0493cb05ff..252bd12010 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN - setmaplayoutindex 441 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc deleted file mode 100644 index 816cbaecc9..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - -SootopolisCity_MysteryEventsHouse_B1F_MapWarps: - warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - -SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: - map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc deleted file mode 100644 index ee7def94c2..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F: - .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json new file mode 100644 index 0000000000..fcc77a3311 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "name": "SootopolisCity_MysteryEventsHouse_B1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 743ba0ccbc..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 - -SootopolisCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY - warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY - warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F - -SootopolisCity_PokemonCenter_1F_MapEvents:: - map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 972cf28e4c..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte SootopolisCity_PokemonCenter_1F_MapEvents - .4byte SootopolisCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..bce2e52bd6 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "name": "SootopolisCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc deleted file mode 100644 index e8fb6e09f1..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -SootopolisCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -SootopolisCity_PokemonCenter_2F_MapEvents:: - map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 03ab97ea5a..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte SootopolisCity_PokemonCenter_2F_MapEvents - .4byte SootopolisCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..32e27dbdf2 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", + "name": "SootopolisCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc deleted file mode 100644 index eeb21d3af4..0000000000 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - -SouthernIsland_Exterior_MapWarps: - warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR - warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR - -SouthernIsland_Exterior_MapBGEvents: - bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C - -SouthernIsland_Exterior_MapEvents:: - map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents - diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc deleted file mode 100644 index 1288fbdf50..0000000000 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Exterior: - .4byte SouthernIsland_Exterior_Layout - .4byte SouthernIsland_Exterior_MapEvents - .4byte SouthernIsland_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_SOUTHERN_ISLAND_EXTERIOR - .byte MAPSEC_SOUTHERN_ISLAND - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json new file mode 100644 index 0000000000..a747a48b8d --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -0,0 +1,71 @@ +{ + "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "name": "SouthernIsland_Exterior", + "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_SOUTHERN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SouthernIsland_Exterior_EventScript_2429D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 13, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SouthernIsland_Exterior_EventScript_242A3C" + } + ] +} \ No newline at end of file diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc deleted file mode 100644 index 190762f5ba..0000000000 --- a/data/maps/SouthernIsland_Interior/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Interior_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON - -SouthernIsland_Interior_MapWarps: - warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR - warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR - -SouthernIsland_Interior_MapBGEvents: - bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 - -SouthernIsland_Interior_MapEvents:: - map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents - diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc deleted file mode 100644 index 95eb61d7c3..0000000000 --- a/data/maps/SouthernIsland_Interior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Interior: - .4byte SouthernIsland_Interior_Layout - .4byte SouthernIsland_Interior_MapEvents - .4byte SouthernIsland_Interior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_SOUTHERN_ISLAND_INTERIOR - .byte MAPSEC_SOUTHERN_ISLAND - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json new file mode 100644 index 0000000000..6d099763a7 --- /dev/null +++ b/data/maps/SouthernIsland_Interior/map.json @@ -0,0 +1,71 @@ +{ + "id": "MAP_SOUTHERN_ISLAND_INTERIOR", + "name": "SouthernIsland_Interior", + "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_SOUTHERN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 13, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON" + } + ], + "warp_events": [ + { + "x": 13, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 13, + "y": 11, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SouthernIsland_Interior_EventScript_242AC4" + } + ] +} \ No newline at end of file diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc deleted file mode 100644 index f20abd8fd4..0000000000 --- a/data/maps/TerraCave_End/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -TerraCave_End_EventObjects: - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON - -TerraCave_End_MapWarps: - warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE - -TerraCave_End_MapCoordEvents: - coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC - -TerraCave_End_MapEvents:: - map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc deleted file mode 100644 index f95ac38b8c..0000000000 --- a/data/maps/TerraCave_End/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_End: - .4byte TerraCave_End_Layout - .4byte TerraCave_End_MapEvents - .4byte TerraCave_End_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_TERRA_CAVE_END - .byte MAPSEC_TERRA_CAVE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json new file mode 100644 index 0000000000..9b5ab9f32f --- /dev/null +++ b/data/maps/TerraCave_End/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_TERRA_CAVE_END", + "name": "TerraCave_End", + "layout": "LAYOUT_TERRA_CAVE_END", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "x": 17, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_TERRA_CAVE_GROUDON" + } + ], + "warp_events": [ + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "TerraCave_End_EventScript_23B0EC" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc deleted file mode 100644 index bfa4092fdf..0000000000 --- a/data/maps/TerraCave_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TerraCave_Entrance_MapWarps: - warp_def 8, 18, 0, 127, MAP_NONE - warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END - -TerraCave_Entrance_MapEvents:: - map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc deleted file mode 100644 index 5ede2a4487..0000000000 --- a/data/maps/TerraCave_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_Entrance: - .4byte TerraCave_Entrance_Layout - .4byte TerraCave_Entrance_MapEvents - .4byte TerraCave_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_TERRA_CAVE_ENTRANCE - .byte MAPSEC_TERRA_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json new file mode 100644 index 0000000000..8ca5c69dff --- /dev/null +++ b/data/maps/TerraCave_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TERRA_CAVE_ENTRANCE", + "name": "TerraCave_Entrance", + "layout": "LAYOUT_TERRA_CAVE_ENTRANCE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 18, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 14, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TERRA_CAVE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc deleted file mode 100644 index 79faca7e65..0000000000 --- a/data/maps/TradeCenter/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -TradeCenter_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 - -TradeCenter_MapWarps: - warp_def 5, 8, 3, 127, MAP_NONE - warp_def 6, 8, 3, 127, MAP_NONE - -TradeCenter_MapCoordEvents: - coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF - -TradeCenter_MapEvents:: - map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 - diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc deleted file mode 100644 index 80a11cd52f..0000000000 --- a/data/maps/TradeCenter/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TradeCenter: - .4byte TradeCenter_Layout - .4byte TradeCenter_MapEvents - .4byte TradeCenter_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_TRADE_CENTER - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json new file mode 100644 index 0000000000..f7511a7537 --- /dev/null +++ b/data/maps/TradeCenter/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_TRADE_CENTER", + "name": "TradeCenter", + "layout": "LAYOUT_TRADE_CENTER", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TradeCenter_EventScript_2774B6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773F5" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773FF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc deleted file mode 100644 index 21e62b951f..0000000000 --- a/data/maps/TrainerHill_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_1F_MapWarps: - warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F - -TrainerHill_1F_MapEvents:: - map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc deleted file mode 100644 index a3654edf2a..0000000000 --- a/data/maps/TrainerHill_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_1F: - .4byte TrainerHill_1F_Layout - .4byte TrainerHill_1F_MapEvents - .4byte TrainerHill_1F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_1F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json new file mode 100644 index 0000000000..77c8ee094f --- /dev/null +++ b/data/maps/TrainerHill_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_1F", + "name": "TrainerHill_1F", + "layout": "LAYOUT_TRAINER_HILL_1F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc deleted file mode 100644 index 4752e33cdc..0000000000 --- a/data/maps/TrainerHill_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_2F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F - -TrainerHill_2F_MapEvents:: - map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc deleted file mode 100644 index 2f607baff6..0000000000 --- a/data/maps/TrainerHill_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_2F: - .4byte TrainerHill_2F_Layout - .4byte TrainerHill_2F_MapEvents - .4byte TrainerHill_2F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_2F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json new file mode 100644 index 0000000000..a10f68baf4 --- /dev/null +++ b/data/maps/TrainerHill_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_2F", + "name": "TrainerHill_2F", + "layout": "LAYOUT_TRAINER_HILL_2F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc deleted file mode 100644 index 5de009a47c..0000000000 --- a/data/maps/TrainerHill_3F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_3F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F - -TrainerHill_3F_MapEvents:: - map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc deleted file mode 100644 index 4dd8e394fb..0000000000 --- a/data/maps/TrainerHill_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_3F: - .4byte TrainerHill_3F_Layout - .4byte TrainerHill_3F_MapEvents - .4byte TrainerHill_3F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_3F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json new file mode 100644 index 0000000000..dfaa57f59d --- /dev/null +++ b/data/maps/TrainerHill_3F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_3F", + "name": "TrainerHill_3F", + "layout": "LAYOUT_TRAINER_HILL_3F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_2F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc deleted file mode 100644 index 05f6e89178..0000000000 --- a/data/maps/TrainerHill_4F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_4F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF - -TrainerHill_4F_MapEvents:: - map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc deleted file mode 100644 index 4f370c5d98..0000000000 --- a/data/maps/TrainerHill_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_4F: - .4byte TrainerHill_4F_Layout - .4byte TrainerHill_4F_MapEvents - .4byte TrainerHill_4F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_4F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json new file mode 100644 index 0000000000..01f20a8f7f --- /dev/null +++ b/data/maps/TrainerHill_4F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_4F", + "name": "TrainerHill_4F", + "layout": "LAYOUT_TRAINER_HILL_4F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_3F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc deleted file mode 100644 index c0336a267a..0000000000 --- a/data/maps/TrainerHill_Elevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -TrainerHill_Elevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 - -TrainerHill_Elevator_MapWarps: - warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF - warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF - -TrainerHill_Elevator_MapEvents:: - map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc deleted file mode 100644 index 5eeaa994be..0000000000 --- a/data/maps/TrainerHill_Elevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Elevator: - .4byte BattleElevator_Layout - .4byte TrainerHill_Elevator_MapEvents - .4byte TrainerHill_Elevator_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_ELEVATOR - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json new file mode 100644 index 0000000000..731bcf44a0 --- /dev/null +++ b/data/maps/TrainerHill_Elevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_TRAINER_HILL_ELEVATOR", + "name": "TrainerHill_Elevator", + "layout": "LAYOUT_BATTLE_ELEVATOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Elevator_EventScript_26935F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc deleted file mode 100644 index ddc3f3f094..0000000000 --- a/data/maps/TrainerHill_Entrance/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -TrainerHill_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 - object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 - -TrainerHill_Entrance_MapWarps: - warp_def 9, 16, 3, 4, MAP_ROUTE111 - warp_def 10, 16, 3, 4, MAP_ROUTE111 - warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F - -TrainerHill_Entrance_MapCoordEvents: - coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 - -TrainerHill_Entrance_MapBGEvents: - bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 - -TrainerHill_Entrance_MapEvents:: - map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents - diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc deleted file mode 100644 index 26e215a6e8..0000000000 --- a/data/maps/TrainerHill_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Entrance: - .4byte TrainerHill_Entrance_Layout - .4byte TrainerHill_Entrance_MapEvents - .4byte TrainerHill_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_ENTRANCE - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json new file mode 100644 index 0000000000..32f6cee379 --- /dev/null +++ b/data/maps/TrainerHill_Entrance/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_TRAINER_HILL_ENTRANCE", + "name": "TrainerHill_Entrance", + "layout": "LAYOUT_TRAINER_HILL_ENTRANCE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2681FD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2681EF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2683C7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2683AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_268391", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 6, + "elevation": 3, + "var": "VAR_0x40D6", + "var_value": 0, + "script": "TrainerHill_Entrance_EventScript_268229" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "TrainerHill_Entrance_EventScript_268388" + } + ] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc deleted file mode 100644 index 0a3b361c4c..0000000000 --- a/data/maps/TrainerHill_Roof/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -TrainerHill_Roof_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 - -TrainerHill_Roof_MapWarps: - warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F - warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR - -TrainerHill_Roof_MapEvents:: - map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc deleted file mode 100644 index c27cb3b5ac..0000000000 --- a/data/maps/TrainerHill_Roof/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Roof: - .4byte TrainerHill_Roof_Layout - .4byte TrainerHill_Roof_MapEvents - .4byte TrainerHill_Roof_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_ROOF - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json new file mode 100644 index 0000000000..d54779a8eb --- /dev/null +++ b/data/maps/TrainerHill_Roof/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_TRAINER_HILL_ROOF", + "name": "TrainerHill_Roof", + "layout": "LAYOUT_TRAINER_HILL_ROOF", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Roof_EventScript_268FB2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 5, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_4F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_HILL_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc deleted file mode 100644 index 01c45b11b0..0000000000 --- a/data/maps/Underwater1/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater1_MapConnectionsList: - connection down, 0, MAP_UNDERWATER2 - connection emerge, 0, MAP_ROUTE124 - -Underwater1_MapConnections: - .4byte 2 - .4byte Underwater1_MapConnectionsList - diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc deleted file mode 100644 index ef329306f8..0000000000 --- a/data/maps/Underwater1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Underwater1_MapBGEvents: - bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS - bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD - bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL - bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL - bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 - bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM - bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 - -Underwater1_MapEvents:: - map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents - diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc deleted file mode 100644 index 06ab5f3832..0000000000 --- a/data/maps/Underwater1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater1: - .4byte Underwater1_Layout - .4byte Underwater1_MapEvents - .4byte Underwater1_MapScripts - .4byte Underwater1_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER1 - .byte MAPSEC_UNDERWATER_124 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json new file mode 100644 index 0000000000..7fd45b45f3 --- /dev/null +++ b/data/maps/Underwater1/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_UNDERWATER1", + "name": "Underwater1", + "layout": "LAYOUT_UNDERWATER1", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_124", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER2" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE124" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 51, + "elevation": 0, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS" + }, + { + "type": "hidden_item", + "x": 14, + "y": 40, + "elevation": 0, + "item": "ITEM_GREEN_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD" + }, + { + "type": "hidden_item", + "x": 66, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL" + }, + { + "type": "hidden_item", + "x": 64, + "y": 54, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 70, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 42, + "y": 5, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM" + }, + { + "type": "hidden_item", + "x": 45, + "y": 36, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc deleted file mode 100644 index 74f11e5afc..0000000000 --- a/data/maps/Underwater2/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater2_MapConnectionsList: - connection up, 0, MAP_UNDERWATER1 - connection right, 0, MAP_UNDERWATER3 - connection emerge, 0, MAP_ROUTE126 - -Underwater2_MapConnections: - .4byte 3 - .4byte Underwater2_MapConnectionsList - diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc deleted file mode 100644 index b4127fc15e..0000000000 --- a/data/maps/Underwater2/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Underwater2_MapWarps: - warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY - -Underwater2_MapBGEvents: - bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE - bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL - bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST - bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL - bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON - bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD - bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL - bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD - -Underwater2_MapEvents:: - map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents - diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc deleted file mode 100644 index d1b11aa62d..0000000000 --- a/data/maps/Underwater2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater2: - .4byte Underwater2_Layout - .4byte Underwater2_MapEvents - .4byte Underwater2_MapScripts - .4byte Underwater2_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER2 - .byte MAPSEC_UNDERWATER_125 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json new file mode 100644 index 0000000000..7977faa4f0 --- /dev/null +++ b/data/maps/Underwater2/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_UNDERWATER2", + "name": "Underwater2", + "layout": "LAYOUT_UNDERWATER2", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_125", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER1" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_UNDERWATER3" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE126" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 45, + "y": 65, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 17, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 41, + "y": 19, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 63, + "y": 19, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST" + }, + { + "type": "hidden_item", + "x": 10, + "y": 36, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL" + }, + { + "type": "hidden_item", + "x": 11, + "y": 39, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 35, + "elevation": 3, + "item": "ITEM_YELLOW_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD" + }, + { + "type": "hidden_item", + "x": 65, + "y": 60, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 9, + "y": 77, + "elevation": 3, + "item": "ITEM_BLUE_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc deleted file mode 100644 index e0e6226def..0000000000 --- a/data/maps/Underwater3/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater3_MapConnectionsList: - connection emerge, 0, MAP_ROUTE127 - connection left, 0, MAP_UNDERWATER2 - connection down, 0, MAP_UNDERWATER4 - -Underwater3_MapConnections: - .4byte 3 - .4byte Underwater3_MapConnectionsList - diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc deleted file mode 100644 index 92964db38d..0000000000 --- a/data/maps/Underwater3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Underwater3_MapWarps: - warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater3_MapBGEvents: - bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE - bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP - bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE - bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD - -Underwater3_MapEvents:: - map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents - diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc deleted file mode 100644 index 1722cfdd83..0000000000 --- a/data/maps/Underwater3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater3: - .4byte Underwater3_Layout - .4byte Underwater3_MapEvents - .4byte Underwater3_MapScripts - .4byte Underwater3_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER3 - .byte MAPSEC_UNDERWATER_126 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json new file mode 100644 index 0000000000..ea87b52354 --- /dev/null +++ b/data/maps/Underwater3/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_UNDERWATER3", + "name": "Underwater3", + "layout": "LAYOUT_UNDERWATER3", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_126", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_UNDERWATER2" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER4" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 57, + "y": 5, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 38, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 42, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE" + }, + { + "type": "hidden_item", + "x": 50, + "y": 36, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP" + }, + { + "type": "hidden_item", + "x": 34, + "y": 72, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 72, + "y": 20, + "elevation": 3, + "item": "ITEM_RED_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc deleted file mode 100644 index c1701e1ddd..0000000000 --- a/data/maps/Underwater4/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater4_MapConnectionsList: - connection up, 0, MAP_UNDERWATER3 - connection emerge, 0, MAP_ROUTE128 - -Underwater4_MapConnections: - .4byte 2 - .4byte Underwater4_MapConnectionsList - diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc deleted file mode 100644 index 4bdc98caf2..0000000000 --- a/data/maps/Underwater4/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Underwater4_MapWarps: - warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN - -Underwater4_MapBGEvents: - bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN - bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL - -Underwater4_MapEvents:: - map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents - diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc deleted file mode 100644 index 2b9975a907..0000000000 --- a/data/maps/Underwater4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater4: - .4byte Underwater4_Layout - .4byte Underwater4_MapEvents - .4byte Underwater4_MapScripts - .4byte Underwater4_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER4 - .byte MAPSEC_UNDERWATER_127 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json new file mode 100644 index 0000000000..9226717c34 --- /dev/null +++ b/data/maps/Underwater4/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_UNDERWATER4", + "name": "Underwater4", + "layout": "LAYOUT_UNDERWATER4", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_127", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER3" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 38, + "y": 26, + "elevation": 3, + "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 19, + "elevation": 3, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN" + }, + { + "type": "hidden_item", + "x": 69, + "y": 18, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc deleted file mode 100644 index c082452d30..0000000000 --- a/data/maps/Underwater5/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater5_MapConnectionsList: - connection emerge, 0, MAP_ROUTE129 - -Underwater5_MapConnections: - .4byte 1 - .4byte Underwater5_MapConnectionsList - diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc deleted file mode 100644 index 5b5c58cf47..0000000000 --- a/data/maps/Underwater5/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater5_MapWarps: - warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater5_MapEvents:: - map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc deleted file mode 100644 index 3466acdf62..0000000000 --- a/data/maps/Underwater5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater5: - .4byte Underwater5_Layout - .4byte Underwater5_MapEvents - .4byte Underwater5_MapScripts - .4byte Underwater5_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER5 - .byte MAPSEC_UNDERWATER_129 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json new file mode 100644 index 0000000000..abd13a187a --- /dev/null +++ b/data/maps/Underwater5/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER5", + "name": "Underwater5", + "layout": "LAYOUT_UNDERWATER5", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_129", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 26, + "y": 3, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 21, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc deleted file mode 100644 index 8e051ea550..0000000000 --- a/data/maps/Underwater6/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater6_MapConnectionsList: - connection emerge, 0, MAP_ROUTE105 - -Underwater6_MapConnections: - .4byte 1 - .4byte Underwater6_MapConnectionsList - diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc deleted file mode 100644 index 067bc5561e..0000000000 --- a/data/maps/Underwater6/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater6_MapWarps: - warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater6_MapEvents:: - map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc deleted file mode 100644 index 5683868e27..0000000000 --- a/data/maps/Underwater6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater6: - .4byte Underwater6_Layout - .4byte Underwater6_MapEvents - .4byte Underwater6_MapScripts - .4byte Underwater6_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER6 - .byte MAPSEC_UNDERWATER_TERRA_CAVE - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json new file mode 100644 index 0000000000..9b19a1fe79 --- /dev/null +++ b/data/maps/Underwater6/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER6", + "name": "Underwater6", + "layout": "LAYOUT_UNDERWATER6", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE105" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 66, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc deleted file mode 100644 index 7113f21e99..0000000000 --- a/data/maps/Underwater7/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater7_MapConnectionsList: - connection emerge, 0, MAP_ROUTE125 - -Underwater7_MapConnections: - .4byte 1 - .4byte Underwater7_MapConnectionsList - diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc deleted file mode 100644 index d4c2a882a8..0000000000 --- a/data/maps/Underwater7/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater7_MapWarps: - warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater7_MapEvents:: - map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc deleted file mode 100644 index a1fa2824c0..0000000000 --- a/data/maps/Underwater7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater7: - .4byte Underwater7_Layout - .4byte Underwater7_MapEvents - .4byte Underwater7_MapScripts - .4byte Underwater7_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER7 - .byte MAPSEC_UNDERWATER_UNK1 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json new file mode 100644 index 0000000000..afabfeeecf --- /dev/null +++ b/data/maps/Underwater7/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER7", + "name": "Underwater7", + "layout": "LAYOUT_UNDERWATER7", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_UNK1", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE125" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 30, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc deleted file mode 100644 index b0da76440e..0000000000 --- a/data/maps/Underwater_MarineCave/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_MarineCave_MapWarps: - warp_def 9, 8, 0, 127, MAP_NONE - -Underwater_MarineCave_MapEvents:: - map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc deleted file mode 100644 index 1cc75bd542..0000000000 --- a/data/maps/Underwater_MarineCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_MarineCave: - .4byte Underwater_MarineCave_Layout - .4byte Underwater_MarineCave_MapEvents - .4byte Underwater_MarineCave_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_UNDERWATER_MARINE_CAVE - .byte MAPSEC_UNDERWATER_MARINE_CAVE - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json new file mode 100644 index 0000000000..c969239c5a --- /dev/null +++ b/data/maps/Underwater_MarineCave/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_UNDERWATER_MARINE_CAVE", + "name": "Underwater_MarineCave", + "layout": "LAYOUT_UNDERWATER_MARINE_CAVE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc deleted file mode 100644 index a514ccf725..0000000000 --- a/data/maps/Underwater_Route134/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_Route134_MapWarps: - warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER - -Underwater_Route134_MapEvents:: - map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc deleted file mode 100644 index 07d1bcd8e7..0000000000 --- a/data/maps/Underwater_Route134/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_Route134: - .4byte Underwater_Route134_Layout - .4byte Underwater_Route134_MapEvents - .4byte Underwater_Route134_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_ROUTE134 - .byte MAPSEC_UNDERWATER_SEALED_CHAMBER - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json new file mode 100644 index 0000000000..f94f110e11 --- /dev/null +++ b/data/maps/Underwater_Route134/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_UNDERWATER_ROUTE134", + "name": "Underwater_Route134", + "layout": "LAYOUT_UNDERWATER_ROUTE134", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SEALED_CHAMBER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc deleted file mode 100644 index d4c212a19b..0000000000 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Underwater_SeafloorCavern_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - -Underwater_SeafloorCavern_MapWarps: - warp_def 6, 7, 0, 0, MAP_UNDERWATER4 - -Underwater_SeafloorCavern_MapEvents:: - map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc deleted file mode 100644 index 0df694b901..0000000000 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SeafloorCavern: - .4byte Underwater_SeafloorCavern_Layout - .4byte Underwater_SeafloorCavern_MapEvents - .4byte Underwater_SeafloorCavern_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SEAFLOOR_CAVERN - .byte MAPSEC_UNDERWATER_128 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json new file mode 100644 index 0000000000..5497a7ba39 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "name": "Underwater_SeafloorCavern", + "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_128", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_UNDERWATER4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc deleted file mode 100644 index e8b93885a5..0000000000 --- a/data/maps/Underwater_SealedChamber/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater_SealedChamber_MapWarps: - warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 - -Underwater_SealedChamber_MapBGEvents: - bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC - -Underwater_SealedChamber_MapEvents:: - map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents - diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc deleted file mode 100644 index f7117f905d..0000000000 --- a/data/maps/Underwater_SealedChamber/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SealedChamber: - .4byte Underwater_SealedChamber_Layout - .4byte Underwater_SealedChamber_MapEvents - .4byte Underwater_SealedChamber_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SEALED_CHAMBER - .byte MAPSEC_UNDERWATER_SEALED_CHAMBER - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json new file mode 100644 index 0000000000..2256ee670e --- /dev/null +++ b/data/maps/Underwater_SealedChamber/map.json @@ -0,0 +1,37 @@ +{ + "id": "MAP_UNDERWATER_SEALED_CHAMBER", + "name": "Underwater_SealedChamber", + "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_ROUTE134", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 12, + "y": 43, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Underwater_SealedChamber_EventScript_2390FC" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc deleted file mode 100644 index 3829ecb103..0000000000 --- a/data/maps/Underwater_SootopolisCity/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater_SootopolisCity_MapWarps: - warp_def 9, 8, 0, 0, MAP_UNDERWATER2 - warp_def 10, 8, 0, 0, MAP_UNDERWATER2 - -Underwater_SootopolisCity_MapEvents:: - map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc deleted file mode 100644 index 31caf4011f..0000000000 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SootopolisCity: - .4byte Underwater_SootopolisCity_Layout - .4byte Underwater_SootopolisCity_MapEvents - .4byte Underwater_SootopolisCity_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SOOTOPOLIS_CITY - .byte MAPSEC_UNDERWATER_SOOTOPOLIS - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json new file mode 100644 index 0000000000..a3b0a1290d --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "name": "Underwater_SootopolisCity", + "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER2", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc deleted file mode 100644 index c78b86eece..0000000000 --- a/data/maps/UnionRoom/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -UnionRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 - object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 - object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 - object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, FLAG_HIDE_UNION_ROOM_PLAYER_7 - object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, FLAG_HIDE_UNION_ROOM_PLAYER_6 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, FLAG_HIDE_UNION_ROOM_PLAYER_5 - object_event 7, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, FLAG_HIDE_UNION_ROOM_PLAYER_3 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 - object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 - -UnionRoom_MapWarps: - warp_def 7, 11, 3, 127, MAP_NONE - warp_def 8, 11, 3, 127, MAP_NONE - -UnionRoom_MapEvents:: - map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc deleted file mode 100644 index cc7e1c3d1d..0000000000 --- a/data/maps/UnionRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnionRoom: - .4byte UnionRoom_Layout - .4byte UnionRoom_MapEvents - .4byte UnionRoom_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_UNION_ROOM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json new file mode 100644 index 0000000000..175ec3ad79 --- /dev/null +++ b/data/maps/UnionRoom/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_UNION_ROOM", + "name": "UnionRoom", + "layout": "LAYOUT_UNION_ROOM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_UNION_ROOM_NURSE", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D236", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D204", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D22C", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D222", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D218", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D20E", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1FA", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1F0", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1E6", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_29/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc deleted file mode 100644 index 0520cd58aa..0000000000 --- a/data/maps/UnknownMap_25_29/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_29: - .4byte UnknownMap_25_29_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_29 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json new file mode 100644 index 0000000000..8f7ac02268 --- /dev/null +++ b/data/maps/UnknownMap_25_29/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_29", + "name": "UnknownMap_25_29", + "layout": "LAYOUT_UNKNOWN_MAP_25_29", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_30/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc deleted file mode 100644 index ed085f46e2..0000000000 --- a/data/maps/UnknownMap_25_30/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_30: - .4byte UnknownMap_25_30_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_30 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json new file mode 100644 index 0000000000..5f321e6b53 --- /dev/null +++ b/data/maps/UnknownMap_25_30/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_30", + "name": "UnknownMap_25_30", + "layout": "LAYOUT_UNKNOWN_MAP_25_30", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_31/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc deleted file mode 100644 index fde407fb83..0000000000 --- a/data/maps/UnknownMap_25_31/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_31: - .4byte UnknownMap_25_31_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_31 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json new file mode 100644 index 0000000000..f7b06ac426 --- /dev/null +++ b/data/maps/UnknownMap_25_31/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_31", + "name": "UnknownMap_25_31", + "layout": "LAYOUT_UNKNOWN_MAP_25_31", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_32/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc deleted file mode 100644 index 1f0655d54c..0000000000 --- a/data/maps/UnknownMap_25_32/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_32: - .4byte UnknownMap_25_32_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_32 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json new file mode 100644 index 0000000000..c963d0129a --- /dev/null +++ b/data/maps/UnknownMap_25_32/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_32", + "name": "UnknownMap_25_32", + "layout": "LAYOUT_UNKNOWN_MAP_25_32", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_33/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc deleted file mode 100644 index 71f5d3523a..0000000000 --- a/data/maps/UnknownMap_25_33/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_33: - .4byte UnknownMap_25_33_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_33 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json new file mode 100644 index 0000000000..441f767b6b --- /dev/null +++ b/data/maps/UnknownMap_25_33/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_33", + "name": "UnknownMap_25_33", + "layout": "LAYOUT_UNKNOWN_MAP_25_33", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_34/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc deleted file mode 100644 index 8fc47f9389..0000000000 --- a/data/maps/UnknownMap_25_34/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_34: - .4byte UnknownMap_25_34_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_34 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json new file mode 100644 index 0000000000..7bdf1d2266 --- /dev/null +++ b/data/maps/UnknownMap_25_34/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_34", + "name": "UnknownMap_25_34", + "layout": "LAYOUT_UNKNOWN_MAP_25_34", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc deleted file mode 100644 index 805bab59e6..0000000000 --- a/data/maps/VerdanturfTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -VerdanturfTown_MapConnectionsList: - connection up, -80, MAP_ROUTE116 - connection right, 0, MAP_ROUTE117 - -VerdanturfTown_MapConnections: - .4byte 2 - .4byte VerdanturfTown_MapConnectionsList - diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc deleted file mode 100644 index d5e99eeceb..0000000000 --- a/data/maps/VerdanturfTown/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -VerdanturfTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 - -VerdanturfTown_MapWarps: - warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY - warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART - warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE - warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL - warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE - warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE - -VerdanturfTown_MapBGEvents: - bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9 - bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 - bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5E2 - bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A - bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 - bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB - bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4 - -VerdanturfTown_MapEvents:: - map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents - diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc deleted file mode 100644 index c2e0109f60..0000000000 --- a/data/maps/VerdanturfTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown: - .4byte VerdanturfTown_Layout - .4byte VerdanturfTown_MapEvents - .4byte VerdanturfTown_MapScripts - .4byte VerdanturfTown_MapConnections - .2byte MUS_GOMACHI0 - .2byte LAYOUT_VERDANTURF_TOWN - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json new file mode 100644 index 0000000000..06e6cc959a --- /dev/null +++ b/data/maps/VerdanturfTown/map.json @@ -0,0 +1,199 @@ +{ + "id": "MAP_VERDANTURF_TOWN", + "name": "VerdanturfTown", + "layout": "LAYOUT_VERDANTURF_TOWN", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -80, + "map": "MAP_ROUTE116" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE117" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 4, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5A8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB575", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5B1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 3, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 3, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 14, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 14, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 15, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5D9" + }, + { + "type": "sign", + "x": 17, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 7, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5E2" + }, + { + "type": "sign", + "x": 13, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 18, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 1, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5EB" + }, + { + "type": "sign", + "x": 7, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5F4" + } + ] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc deleted file mode 100644 index fb424a0560..0000000000 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -VerdanturfTown_BattleTentBattleRoom_MapEvents:: - map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc deleted file mode 100644 index af844405ef..0000000000 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom: - .4byte VerdanturfTown_BattleTentBattleRoom_Layout - .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents - .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json new file mode 100644 index 0000000000..e08187b61d --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "VerdanturfTown_BattleTentBattleRoom", + "layout": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc deleted file mode 100644 index b5a8f71fb2..0000000000 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -VerdanturfTown_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -VerdanturfTown_BattleTentCorridor_MapEvents:: - map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc deleted file mode 100644 index 49e27d7f5f..0000000000 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte VerdanturfTown_BattleTentCorridor_MapEvents - .4byte VerdanturfTown_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json new file mode 100644 index 0000000000..2e3b9aed1f --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR", + "name": "VerdanturfTown_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc deleted file mode 100644 index 68ee1322fa..0000000000 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -VerdanturfTown_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 - -VerdanturfTown_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN - warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN - -VerdanturfTown_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 - -VerdanturfTown_BattleTentLobby_MapEvents:: - map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents - diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc deleted file mode 100644 index 012f55ec9b..0000000000 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte VerdanturfTown_BattleTentLobby_MapEvents - .4byte VerdanturfTown_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json new file mode 100644 index 0000000000..2f5190f61c --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", + "name": "VerdanturfTown_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201873", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02" + } + ] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc deleted file mode 100644 index 8d15647d63..0000000000 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 - -VerdanturfTown_FriendshipRatersHouse_MapWarps: - warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN - -VerdanturfTown_FriendshipRatersHouse_MapEvents:: - map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc deleted file mode 100644 index 512004a3e0..0000000000 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse: - .4byte House2_Layout - .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents - .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json new file mode 100644 index 0000000000..3a67851369 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", + "name": "VerdanturfTown_FriendshipRatersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc deleted file mode 100644 index a5f61b86f6..0000000000 --- a/data/maps/VerdanturfTown_House/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -VerdanturfTown_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 - -VerdanturfTown_House_MapWarps: - warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN - warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN - -VerdanturfTown_House_MapEvents:: - map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc deleted file mode 100644 index 910126e298..0000000000 --- a/data/maps/VerdanturfTown_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_House: - .4byte House1_Layout - .4byte VerdanturfTown_House_MapEvents - .4byte VerdanturfTown_House_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json new file mode 100644 index 0000000000..cf6170e8af --- /dev/null +++ b/data/maps/VerdanturfTown_House/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_VERDANTURF_TOWN_HOUSE", + "name": "VerdanturfTown_House", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_House_EventScript_20335F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_House_EventScript_203368", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc deleted file mode 100644 index 79e731fe4c..0000000000 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -VerdanturfTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 - -VerdanturfTown_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN - -VerdanturfTown_Mart_MapEvents:: - map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc deleted file mode 100644 index e04be5fd60..0000000000 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_Mart: - .4byte Mart_Layout - .4byte VerdanturfTown_Mart_MapEvents - .4byte VerdanturfTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json new file mode 100644 index 0000000000..8ea0e1bf59 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_VERDANTURF_TOWN_MART", + "name": "VerdanturfTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_202587", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025CC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 47449cd1b7..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 - -VerdanturfTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN - warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN - warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F - -VerdanturfTown_PokemonCenter_1F_MapEvents:: - map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc deleted file mode 100644 index e2adc24a40..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte VerdanturfTown_PokemonCenter_1F_MapEvents - .4byte VerdanturfTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..1c1145565d --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "name": "VerdanturfTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc deleted file mode 100644 index a4e13db36e..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -VerdanturfTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -VerdanturfTown_PokemonCenter_2F_MapEvents:: - map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc deleted file mode 100644 index d64084b534..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte VerdanturfTown_PokemonCenter_2F_MapEvents - .4byte VerdanturfTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..ad2df3d36f --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", + "name": "VerdanturfTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc deleted file mode 100644 index 940417c7a1..0000000000 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_WandasHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN - -VerdanturfTown_WandasHouse_MapWarps: - warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN - warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN - -VerdanturfTown_WandasHouse_MapEvents:: - map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc deleted file mode 100644 index bb285600f9..0000000000 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_WandasHouse: - .4byte VerdanturfTown_WandasHouse_Layout - .4byte VerdanturfTown_WandasHouse_MapEvents - .4byte VerdanturfTown_WandasHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json new file mode 100644 index 0000000000..10a3996fdb --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", + "name": "VerdanturfTown_WandasHouse", + "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_2028BF", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_202913", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_2028E1", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_20294E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_20291C", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc deleted file mode 100644 index 1e34108edf..0000000000 --- a/data/maps/VictoryRoad_1F/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -VictoryRoad_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, FLAG_ITEM_VICTORY_ROAD_1F_PP_UP - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 - -VictoryRoad_1F_MapWarps: - warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY - warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY - warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F - warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F - warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F - -VictoryRoad_1F_MapCoordEvents: - coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF - coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 - -VictoryRoad_1F_MapBGEvents: - bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL - -VictoryRoad_1F_MapEvents:: - map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents - diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc deleted file mode 100644 index eb1e53c9b7..0000000000 --- a/data/maps/VictoryRoad_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_1F: - .4byte VictoryRoad_1F_Layout - .4byte VictoryRoad_1F_MapEvents - .4byte VictoryRoad_1F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_1F - .byte MAPSEC_VICTORY_ROAD - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json new file mode 100644 index 0000000000..b459815872 --- /dev/null +++ b/data/maps/VictoryRoad_1F/map.json @@ -0,0 +1,202 @@ +{ + "id": "MAP_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F", + "layout": "LAYOUT_VICTORY_ROAD_1F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 33, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_1F_EventScript_235E73", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 6, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_1F_EventScript_235EA1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 27, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_1F_EventScript_235E8A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 12, + "y": 25, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_235E2C", + "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 40, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_291483", + "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 37, + "y": 39, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_291490", + "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 31, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_235E35", + "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 29, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_1F_EventScript_235ECF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 32, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_1F_EventScript_235EB8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 40, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 2 + }, + { + "x": 39, + "y": 5, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 32, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 5 + }, + { + "x": 42, + "y": 38, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 14, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 23, + "elevation": 4, + "var": "VAR_0x40C3", + "var_value": 0, + "script": "VictoryRoad_1F_EventScript_235DAF" + }, + { + "type": "trigger", + "x": 3, + "y": 23, + "elevation": 4, + "var": "VAR_0x40C3", + "var_value": 0, + "script": "VictoryRoad_1F_EventScript_235DC8" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 39, + "elevation": 4, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc deleted file mode 100644 index 35c4fe4285..0000000000 --- a/data/maps/VictoryRoad_B1F/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -VictoryRoad_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1E - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1A - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1B - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1C - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1D - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1F - object_event 14, EVENT_OBJ_GFX_MAN_3, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_15 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, FLAG_ITEM_VICTORY_ROAD_B1F_TM_29 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE - object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 - object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 - -VictoryRoad_B1F_MapWarps: - warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F - warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F - warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F - warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F - warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F - warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F - warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F - -VictoryRoad_B1F_MapEvents:: - map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc deleted file mode 100644 index cc0064fd67..0000000000 --- a/data/maps/VictoryRoad_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B1F: - .4byte VictoryRoad_B1F_Layout - .4byte VictoryRoad_B1F_MapEvents - .4byte VictoryRoad_B1F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_B1F - .byte MAPSEC_VICTORY_ROAD - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json new file mode 100644 index 0000000000..523eddc063 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/map.json @@ -0,0 +1,344 @@ +{ + "id": "MAP_VICTORY_ROAD_B1F", + "name": "VictoryRoad_B1F", + "layout": "LAYOUT_VICTORY_ROAD_B1F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 20, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 21, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 35, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_1E" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 19, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1A" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 18, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1C" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 21, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1D" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 34, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_1F" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 37, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_B1F_EventScript_2364E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B1F_EventScript_2364FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B1F_EventScript_236513", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 34, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 42, + "y": 8, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_29149D", + "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2914AA", + "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B1F_EventScript_23652A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_B1F_EventScript_236541", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 16, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 2 + }, + { + "x": 42, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 3 + }, + { + "x": 42, + "y": 2, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 3, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 4 + }, + { + "x": 20, + "y": 21, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc deleted file mode 100644 index 0bc77cade5..0000000000 --- a/data/maps/VictoryRoad_B2F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -VictoryRoad_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 - -VictoryRoad_B2F_MapWarps: - warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F - warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F - warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F - warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F - -VictoryRoad_B2F_MapBGEvents: - bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR - bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL - -VictoryRoad_B2F_MapEvents:: - map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents - diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc deleted file mode 100644 index 0af51f9717..0000000000 --- a/data/maps/VictoryRoad_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B2F: - .4byte VictoryRoad_B2F_Layout - .4byte VictoryRoad_B2F_MapEvents - .4byte VictoryRoad_B2F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_B2F - .byte MAPSEC_VICTORY_ROAD - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json new file mode 100644 index 0000000000..2667155a92 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_VICTORY_ROAD_B2F", + "name": "VictoryRoad_B2F", + "layout": "LAYOUT_VICTORY_ROAD_B2F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_2368D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 43, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B2F_EventScript_2368EC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 2, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236903", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 35, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_23691A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B2F_EventScript_2914B7", + "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 25, + "y": 18, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236948", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 25, + "y": 21, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236931", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 0 + }, + { + "x": 43, + "y": 2, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 12, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 28, + "y": 5, + "elevation": 3, + "item": "ITEM_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR" + }, + { + "type": "hidden_item", + "x": 37, + "y": 1, + "elevation": 3, + "item": "ITEM_MAX_REPEL", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL" + } + ] +} \ No newline at end of file diff --git a/data/maps/connections.inc b/data/maps/connections.inc deleted file mode 100644 index a950249210..0000000000 --- a/data/maps/connections.inc +++ /dev/null @@ -1,65 +0,0 @@ - .include "data/maps/LittlerootTown/connections.inc" - .include "data/maps/OldaleTown/connections.inc" - .include "data/maps/DewfordTown/connections.inc" - .include "data/maps/LavaridgeTown/connections.inc" - .include "data/maps/FallarborTown/connections.inc" - .include "data/maps/VerdanturfTown/connections.inc" - .include "data/maps/PacifidlogTown/connections.inc" - .include "data/maps/PetalburgCity/connections.inc" - .include "data/maps/SlateportCity/connections.inc" - .include "data/maps/MauvilleCity/connections.inc" - .include "data/maps/RustboroCity/connections.inc" - .include "data/maps/FortreeCity/connections.inc" - .include "data/maps/LilycoveCity/connections.inc" - .include "data/maps/MossdeepCity/connections.inc" - .include "data/maps/SootopolisCity/connections.inc" - .include "data/maps/EverGrandeCity/connections.inc" - .include "data/maps/Route101/connections.inc" - .include "data/maps/Route102/connections.inc" - .include "data/maps/Route103/connections.inc" - .include "data/maps/Route104/connections.inc" - .include "data/maps/Route105/connections.inc" - .include "data/maps/Route106/connections.inc" - .include "data/maps/Route107/connections.inc" - .include "data/maps/Route108/connections.inc" - .include "data/maps/Route109/connections.inc" - .include "data/maps/Route110/connections.inc" - .include "data/maps/Route111/connections.inc" - .include "data/maps/Route112/connections.inc" - .include "data/maps/Route113/connections.inc" - .include "data/maps/Route114/connections.inc" - .include "data/maps/Route115/connections.inc" - .include "data/maps/Route116/connections.inc" - .include "data/maps/Route117/connections.inc" - .include "data/maps/Route118/connections.inc" - .include "data/maps/Route119/connections.inc" - .include "data/maps/Route120/connections.inc" - .include "data/maps/Route121/connections.inc" - .include "data/maps/Route122/connections.inc" - .include "data/maps/Route123/connections.inc" - .include "data/maps/Route124/connections.inc" - .include "data/maps/Route125/connections.inc" - .include "data/maps/Route126/connections.inc" - .include "data/maps/Route127/connections.inc" - .include "data/maps/Route128/connections.inc" - .include "data/maps/Route129/connections.inc" - .include "data/maps/Route130/connections.inc" - .include "data/maps/Route131/connections.inc" - .include "data/maps/Route132/connections.inc" - .include "data/maps/Route133/connections.inc" - .include "data/maps/Route134/connections.inc" - .include "data/maps/Underwater6/connections.inc" - .include "data/maps/Underwater1/connections.inc" - .include "data/maps/Underwater7/connections.inc" - .include "data/maps/Underwater2/connections.inc" - .include "data/maps/Underwater3/connections.inc" - .include "data/maps/Underwater4/connections.inc" - .include "data/maps/Underwater5/connections.inc" - .include "data/maps/SafariZone_Northwest/connections.inc" - .include "data/maps/SafariZone_North/connections.inc" - .include "data/maps/SafariZone_Southwest/connections.inc" - .include "data/maps/SafariZone_South/connections.inc" - .include "data/maps/SafariZone_Northeast/connections.inc" - .include "data/maps/SafariZone_Southeast/connections.inc" - .include "data/maps/BattleFrontier_OutsideWest/connections.inc" - .include "data/maps/BattleFrontier_OutsideEast/connections.inc" diff --git a/data/maps/groups.inc b/data/maps/groups.inc deleted file mode 100644 index 77f9c4441b..0000000000 --- a/data/maps/groups.inc +++ /dev/null @@ -1,623 +0,0 @@ -gMapGroup0: @ 8485D60 - .4byte PetalburgCity - .4byte SlateportCity - .4byte MauvilleCity - .4byte RustboroCity - .4byte FortreeCity - .4byte LilycoveCity - .4byte MossdeepCity - .4byte SootopolisCity - .4byte EverGrandeCity - .4byte LittlerootTown - .4byte OldaleTown - .4byte DewfordTown - .4byte LavaridgeTown - .4byte FallarborTown - .4byte VerdanturfTown - .4byte PacifidlogTown - .4byte Route101 - .4byte Route102 - .4byte Route103 - .4byte Route104 - .4byte Route105 - .4byte Route106 - .4byte Route107 - .4byte Route108 - .4byte Route109 - .4byte Route110 - .4byte Route111 - .4byte Route112 - .4byte Route113 - .4byte Route114 - .4byte Route115 - .4byte Route116 - .4byte Route117 - .4byte Route118 - .4byte Route119 - .4byte Route120 - .4byte Route121 - .4byte Route122 - .4byte Route123 - .4byte Route124 - .4byte Route125 - .4byte Route126 - .4byte Route127 - .4byte Route128 - .4byte Route129 - .4byte Route130 - .4byte Route131 - .4byte Route132 - .4byte Route133 - .4byte Route134 - .4byte Underwater1 - .4byte Underwater2 - .4byte Underwater3 - .4byte Underwater4 - .4byte Underwater5 - .4byte Underwater6 - .4byte Underwater7 - -gMapGroup1: @ 8485E44 - .4byte LittlerootTown_BrendansHouse_1F - .4byte LittlerootTown_BrendansHouse_2F - .4byte LittlerootTown_MaysHouse_1F - .4byte LittlerootTown_MaysHouse_2F - .4byte LittlerootTown_ProfessorBirchsLab - -gMapGroup2: @ 8485E58 - .4byte OldaleTown_House1 - .4byte OldaleTown_House2 - .4byte OldaleTown_PokemonCenter_1F - .4byte OldaleTown_PokemonCenter_2F - .4byte OldaleTown_Mart - -gMapGroup3: @ 8485E6C - .4byte DewfordTown_House1 - .4byte DewfordTown_PokemonCenter_1F - .4byte DewfordTown_PokemonCenter_2F - .4byte DewfordTown_Gym - .4byte DewfordTown_Hall - .4byte DewfordTown_House2 - -gMapGroup4: @ 8485E84 - .4byte LavaridgeTown_HerbShop - .4byte LavaridgeTown_Gym_1F - .4byte LavaridgeTown_Gym_B1F - .4byte LavaridgeTown_House - .4byte LavaridgeTown_Mart - .4byte LavaridgeTown_PokemonCenter_1F - .4byte LavaridgeTown_PokemonCenter_2F - -gMapGroup5: @ 8485EA0 - .4byte FallarborTown_Mart - .4byte FallarborTown_BattleTentLobby - .4byte FallarborTown_BattleTentCorridor - .4byte FallarborTown_BattleTentBattleRoom - .4byte FallarborTown_PokemonCenter_1F - .4byte FallarborTown_PokemonCenter_2F - .4byte FallarborTown_House1 - .4byte FallarborTown_House2 - -gMapGroup6: @ 8485EC0 - .4byte VerdanturfTown_BattleTentLobby - .4byte VerdanturfTown_BattleTentCorridor - .4byte VerdanturfTown_BattleTentBattleRoom - .4byte VerdanturfTown_Mart - .4byte VerdanturfTown_PokemonCenter_1F - .4byte VerdanturfTown_PokemonCenter_2F - .4byte VerdanturfTown_WandasHouse - .4byte VerdanturfTown_FriendshipRatersHouse - .4byte VerdanturfTown_House - -gMapGroup7: @ 8485EE4 - .4byte PacifidlogTown_PokemonCenter_1F - .4byte PacifidlogTown_PokemonCenter_2F - .4byte PacifidlogTown_House1 - .4byte PacifidlogTown_House2 - .4byte PacifidlogTown_House3 - .4byte PacifidlogTown_House4 - .4byte PacifidlogTown_House5 - -gMapGroup8: @ 8485F00 - .4byte PetalburgCity_WallysHouse - .4byte PetalburgCity_Gym - .4byte PetalburgCity_House1 - .4byte PetalburgCity_House2 - .4byte PetalburgCity_PokemonCenter_1F - .4byte PetalburgCity_PokemonCenter_2F - .4byte PetalburgCity_Mart - -gMapGroup9: @ 8485F1C - .4byte SlateportCity_SternsShipyard_1F - .4byte SlateportCity_SternsShipyard_2F - .4byte SlateportCity_BattleTentLobby - .4byte SlateportCity_BattleTentCorridor - .4byte SlateportCity_BattleTentBattleRoom - .4byte SlateportCity_House1 - .4byte SlateportCity_PokemonFanClub - .4byte SlateportCity_OceanicMuseum_1F - .4byte SlateportCity_OceanicMuseum_2F - .4byte SlateportCity_Harbor - .4byte SlateportCity_House2 - .4byte SlateportCity_PokemonCenter_1F - .4byte SlateportCity_PokemonCenter_2F - .4byte SlateportCity_Mart - -gMapGroup10: @ 8485F54 - .4byte MauvilleCity_Gym - .4byte MauvilleCity_BikeShop - .4byte MauvilleCity_House1 - .4byte MauvilleCity_GameCorner - .4byte MauvilleCity_House2 - .4byte MauvilleCity_PokemonCenter_1F - .4byte MauvilleCity_PokemonCenter_2F - .4byte MauvilleCity_Mart - -gMapGroup11: @ 8485F74 - .4byte RustboroCity_DevonCorp_1F - .4byte RustboroCity_DevonCorp_2F - .4byte RustboroCity_DevonCorp_3F - .4byte RustboroCity_Gym - .4byte RustboroCity_PokemonSchool - .4byte RustboroCity_PokemonCenter_1F - .4byte RustboroCity_PokemonCenter_2F - .4byte RustboroCity_Mart - .4byte RustboroCity_Flat1_1F - .4byte RustboroCity_Flat1_2F - .4byte RustboroCity_House1 - .4byte RustboroCity_CuttersHouse - .4byte RustboroCity_House2 - .4byte RustboroCity_Flat2_1F - .4byte RustboroCity_Flat2_2F - .4byte RustboroCity_Flat2_3F - .4byte RustboroCity_House3 - -gMapGroup12: @ 8485FB8 - .4byte FortreeCity_House1 - .4byte FortreeCity_Gym - .4byte FortreeCity_PokemonCenter_1F - .4byte FortreeCity_PokemonCenter_2F - .4byte FortreeCity_Mart - .4byte FortreeCity_House2 - .4byte FortreeCity_House3 - .4byte FortreeCity_House4 - .4byte FortreeCity_House5 - .4byte FortreeCity_DecorationShop - -gMapGroup13: @ 8485FE0 - .4byte LilycoveCity_CoveLilyMotel_1F - .4byte LilycoveCity_CoveLilyMotel_2F - .4byte LilycoveCity_LilycoveMuseum_1F - .4byte LilycoveCity_LilycoveMuseum_2F - .4byte LilycoveCity_ContestLobby - .4byte LilycoveCity_ContestHall - .4byte LilycoveCity_PokemonCenter_1F - .4byte LilycoveCity_PokemonCenter_2F - .4byte LilycoveCity_UnusedMart - .4byte LilycoveCity_PokemonTrainerFanClub - .4byte LilycoveCity_Harbor - .4byte LilycoveCity_MoveDeletersHouse - .4byte LilycoveCity_House1 - .4byte LilycoveCity_House2 - .4byte LilycoveCity_House3 - .4byte LilycoveCity_House4 - .4byte LilycoveCity_DepartmentStore_1F - .4byte LilycoveCity_DepartmentStore_2F - .4byte LilycoveCity_DepartmentStore_3F - .4byte LilycoveCity_DepartmentStore_4F - .4byte LilycoveCity_DepartmentStore_5F - .4byte LilycoveCity_DepartmentStoreRooftop - .4byte LilycoveCity_DepartmentStoreElevator - -gMapGroup14: @ 848603C - .4byte MossdeepCity_Gym - .4byte MossdeepCity_House1 - .4byte MossdeepCity_House2 - .4byte MossdeepCity_PokemonCenter_1F - .4byte MossdeepCity_PokemonCenter_2F - .4byte MossdeepCity_Mart - .4byte MossdeepCity_House3 - .4byte MossdeepCity_StevensHouse - .4byte MossdeepCity_House4 - .4byte MossdeepCity_SpaceCenter_1F - .4byte MossdeepCity_SpaceCenter_2F - .4byte MossdeepCity_GameCorner_1F - .4byte MossdeepCity_GameCorner_B1F - -gMapGroup15: @ 8486070 - .4byte SootopolisCity_Gym_1F - .4byte SootopolisCity_Gym_B1F - .4byte SootopolisCity_PokemonCenter_1F - .4byte SootopolisCity_PokemonCenter_2F - .4byte SootopolisCity_Mart - .4byte SootopolisCity_House1 - .4byte SootopolisCity_House2 - .4byte SootopolisCity_House3 - .4byte SootopolisCity_House4 - .4byte SootopolisCity_House5 - .4byte SootopolisCity_House6 - .4byte SootopolisCity_House7 - .4byte SootopolisCity_LotadAndSeedotHouse - .4byte SootopolisCity_MysteryEventsHouse_1F - .4byte SootopolisCity_MysteryEventsHouse_B1F - -gMapGroup16: @ 84860AC - .4byte EverGrandeCity_SidneysRoom - .4byte EverGrandeCity_PhoebesRoom - .4byte EverGrandeCity_GlaciasRoom - .4byte EverGrandeCity_DrakesRoom - .4byte EverGrandeCity_ChampionsRoom - .4byte EverGrandeCity_Hall1 - .4byte EverGrandeCity_Hall2 - .4byte EverGrandeCity_Hall3 - .4byte EverGrandeCity_Hall4 - .4byte EverGrandeCity_Hall5 - .4byte EverGrandeCity_PokemonLeague_1F - .4byte EverGrandeCity_HallOfFame - .4byte EverGrandeCity_PokemonCenter_1F - .4byte EverGrandeCity_PokemonCenter_2F - .4byte EverGrandeCity_PokemonLeague_2F - -gMapGroup17: @ 84860E8 - .4byte Route104_MrBrineysHouse - .4byte Route104_PrettyPetalFlowerShop - -gMapGroup18: @ 84860F0 - .4byte Route111_WinstrateFamilysHouse - .4byte Route111_OldLadysRestStop - -gMapGroup19: @ 84860F8 - .4byte Route112_CableCarStation - .4byte MtChimney_CableCarStation - -gMapGroup20: @ 8486100 - .4byte Route114_FossilManiacsHouse - .4byte Route114_FossilManiacsTunnel - .4byte Route114_LanettesHouse - -gMapGroup21: @ 848610C - .4byte Route116_TunnelersRestHouse - -gMapGroup22: @ 8486110 - .4byte Route117_PokemonDayCare - -gMapGroup23: @ 8486114 - .4byte Route121_SafariZoneEntrance - -gMapGroup24: @ 8486118 - .4byte MeteorFalls_1F_1R - .4byte MeteorFalls_1F_2R - .4byte MeteorFalls_B1F_1R - .4byte MeteorFalls_B1F_2R - .4byte RusturfTunnel - .4byte Underwater_SootopolisCity - .4byte DesertRuins - .4byte GraniteCave_1F - .4byte GraniteCave_B1F - .4byte GraniteCave_B2F - .4byte GraniteCave_StevensRoom - .4byte PetalburgWoods - .4byte MtChimney - .4byte JaggedPass - .4byte FieryPath - .4byte MtPyre_1F - .4byte MtPyre_2F - .4byte MtPyre_3F - .4byte MtPyre_4F - .4byte MtPyre_5F - .4byte MtPyre_6F - .4byte MtPyre_Exterior - .4byte MtPyre_Summit - .4byte AquaHideout_1F - .4byte AquaHideout_B1F - .4byte AquaHideout_B2F - .4byte Underwater_SeafloorCavern - .4byte SeafloorCavern_Entrance - .4byte SeafloorCavern_Room1 - .4byte SeafloorCavern_Room2 - .4byte SeafloorCavern_Room3 - .4byte SeafloorCavern_Room4 - .4byte SeafloorCavern_Room5 - .4byte SeafloorCavern_Room6 - .4byte SeafloorCavern_Room7 - .4byte SeafloorCavern_Room8 - .4byte SeafloorCavern_Room9 - .4byte CaveOfOrigin_Entrance - .4byte CaveOfOrigin_1F - .4byte CaveOfOrigin_UnusedRubySapphireMap1 - .4byte CaveOfOrigin_UnusedRubySapphireMap2 - .4byte CaveOfOrigin_UnusedRubySapphireMap3 - .4byte CaveOfOrigin_B1F - .4byte VictoryRoad_1F - .4byte VictoryRoad_B1F - .4byte VictoryRoad_B2F - .4byte ShoalCave_LowTideEntranceRoom - .4byte ShoalCave_LowTideInnerRoom - .4byte ShoalCave_LowTideStairsRoom - .4byte ShoalCave_LowTideLowerRoom - .4byte ShoalCave_HighTideEntranceRoom - .4byte ShoalCave_HighTideInnerRoom - .4byte NewMauville_Entrance - .4byte NewMauville_Inside - .4byte AbandonedShip_Deck - .4byte AbandonedShip_Corridors_1F - .4byte AbandonedShip_Rooms_1F - .4byte AbandonedShip_Corridors_B1F - .4byte AbandonedShip_Rooms_B1F - .4byte AbandonedShip_Rooms2_B1F - .4byte AbandonedShip_Underwater1 - .4byte AbandonedShip_Room_B1F - .4byte AbandonedShip_Rooms2_1F - .4byte AbandonedShip_CaptainsOffice - .4byte AbandonedShip_Underwater2 - .4byte AbandonedShip_HiddenFloorCorridors - .4byte AbandonedShip_HiddenFloorRooms - .4byte IslandCave - .4byte AncientTomb - .4byte Underwater_Route134 - .4byte Underwater_SealedChamber - .4byte SealedChamber_OuterRoom - .4byte SealedChamber_InnerRoom - .4byte ScorchedSlab - .4byte AquaHideout_UnusedRubyMap1 - .4byte AquaHideout_UnusedRubyMap2 - .4byte AquaHideout_UnusedRubyMap3 - .4byte SkyPillar_Entrance - .4byte SkyPillar_Outside - .4byte SkyPillar_1F - .4byte SkyPillar_2F - .4byte SkyPillar_3F - .4byte SkyPillar_4F - .4byte ShoalCave_LowTideIceRoom - .4byte SkyPillar_5F - .4byte SkyPillar_Top - .4byte MagmaHideout_1F - .4byte MagmaHideout_2F_1R - .4byte MagmaHideout_2F_2R - .4byte MagmaHideout_3F_1R - .4byte MagmaHideout_3F_2R - .4byte MagmaHideout_4F - .4byte MagmaHideout_3F_3R - .4byte MagmaHideout_2F_3R - .4byte MirageTower_1F - .4byte MirageTower_2F - .4byte MirageTower_3F - .4byte MirageTower_4F - .4byte DesertUnderpass - .4byte ArtisanCave_B1F - .4byte ArtisanCave_1F - .4byte Underwater_MarineCave - .4byte MarineCave_Entrance - .4byte MarineCave_End - .4byte TerraCave_Entrance - .4byte TerraCave_End - .4byte AlteringCave - .4byte MeteorFalls_StevensCave - -gMapGroup25: @ 84862C8 - .4byte SecretBase_RedCave1 - .4byte SecretBase_BrownCave1 - .4byte SecretBase_BlueCave1 - .4byte SecretBase_YellowCave1 - .4byte SecretBase_Tree1 - .4byte SecretBase_Shrub1 - .4byte SecretBase_RedCave2 - .4byte SecretBase_BrownCave2 - .4byte SecretBase_BlueCave2 - .4byte SecretBase_YellowCave2 - .4byte SecretBase_Tree2 - .4byte SecretBase_Shrub2 - .4byte SecretBase_RedCave3 - .4byte SecretBase_BrownCave3 - .4byte SecretBase_BlueCave3 - .4byte SecretBase_YellowCave3 - .4byte SecretBase_Tree3 - .4byte SecretBase_Shrub3 - .4byte SecretBase_RedCave4 - .4byte SecretBase_BrownCave4 - .4byte SecretBase_BlueCave4 - .4byte SecretBase_YellowCave4 - .4byte SecretBase_Tree4 - .4byte SecretBase_Shrub4 - .4byte SingleBattleColosseum - .4byte TradeCenter - .4byte RecordCorner - .4byte DoubleBattleColosseum - .4byte LinkContestRoom1 - .4byte UnknownMap_25_29 - .4byte UnknownMap_25_30 - .4byte UnknownMap_25_31 - .4byte UnknownMap_25_32 - .4byte UnknownMap_25_33 - .4byte UnknownMap_25_34 - .4byte LinkContestRoom2 - .4byte LinkContestRoom3 - .4byte LinkContestRoom4 - .4byte LinkContestRoom5 - .4byte LinkContestRoom6 - .4byte InsideOfTruck - .4byte SSTidalCorridor - .4byte SSTidalLowerDeck - .4byte SSTidalRooms - .4byte BattlePyramidSquare01 - .4byte BattlePyramidSquare02 - .4byte BattlePyramidSquare03 - .4byte BattlePyramidSquare04 - .4byte BattlePyramidSquare05 - .4byte BattlePyramidSquare06 - .4byte BattlePyramidSquare07 - .4byte BattlePyramidSquare08 - .4byte BattlePyramidSquare09 - .4byte BattlePyramidSquare10 - .4byte BattlePyramidSquare11 - .4byte BattlePyramidSquare12 - .4byte BattlePyramidSquare13 - .4byte BattlePyramidSquare14 - .4byte BattlePyramidSquare15 - .4byte BattlePyramidSquare16 - .4byte UnionRoom - -gMapGroup26: @ 84863BC - .4byte SafariZone_Northwest - .4byte SafariZone_North - .4byte SafariZone_Southwest - .4byte SafariZone_South - .4byte BattleFrontier_OutsideWest - .4byte BattleFrontier_BattleTowerLobby - .4byte BattleFrontier_BattleTowerElevator - .4byte BattleFrontier_BattleTowerCorridor - .4byte BattleFrontier_BattleTowerBattleRoom - .4byte SouthernIsland_Exterior - .4byte SouthernIsland_Interior - .4byte SafariZone_RestHouse - .4byte SafariZone_Northeast - .4byte SafariZone_Southeast - .4byte BattleFrontier_OutsideEast - .4byte BattleFrontier_BattleTowerMultiBattleRoom - .4byte BattleFrontier_BattleTowerCorridor2 - .4byte BattleFrontier_BattleTowerBattleRoom2 - .4byte BattleFrontier_BattleDomeLobby - .4byte BattleFrontier_BattleDomeCorridor - .4byte BattleFrontier_BattleDomePreBattleRoom - .4byte BattleFrontier_BattleDomeBattleRoom - .4byte BattleFrontier_BattlePalaceLobby - .4byte BattleFrontier_BattlePalaceCorridor - .4byte BattleFrontier_BattlePalaceBattleRoom - .4byte BattleFrontier_BattlePyramidLobby - .4byte BattleFrontier_BattlePyramidEmptySquare - .4byte BattleFrontier_BattlePyramidTop - .4byte BattleFrontier_BattleArenaLobby - .4byte BattleFrontier_BattleArenaCorridor - .4byte BattleFrontier_BattleArenaBattleRoom - .4byte BattleFrontier_BattleFactoryLobby - .4byte BattleFrontier_BattleFactoryPreBattleRoom - .4byte BattleFrontier_BattleFactoryBattleRoom - .4byte BattleFrontier_BattlePikeLobby - .4byte BattleFrontier_BattlePikeCorridor - .4byte BattleFrontier_BattlePikeThreePathRoom - .4byte BattleFrontier_BattlePikeRandomRoom1 - .4byte BattleFrontier_BattlePikeRandomRoom2 - .4byte BattleFrontier_BattlePikeRandomRoom3 - .4byte BattleFrontier_RankingHall - .4byte BattleFrontier_Lounge1 - .4byte BattleFrontier_BattlePointExchangeServiceCorner - .4byte BattleFrontier_Lounge2 - .4byte BattleFrontier_Lounge3 - .4byte BattleFrontier_Lounge4 - .4byte BattleFrontier_ScottsHouse - .4byte BattleFrontier_Lounge5 - .4byte BattleFrontier_Lounge6 - .4byte BattleFrontier_Lounge7 - .4byte BattleFrontier_ReceptionGate - .4byte BattleFrontier_Lounge8 - .4byte BattleFrontier_Lounge9 - .4byte BattleFrontier_PokemonCenter_1F - .4byte BattleFrontier_PokemonCenter_2F - .4byte BattleFrontier_Mart - .4byte FarawayIsland_Entrance - .4byte FarawayIsland_Interior - .4byte BirthIsland_Exterior - .4byte BirthIsland_Harbor - .4byte TrainerHill_Entrance - .4byte TrainerHill_1F - .4byte TrainerHill_2F - .4byte TrainerHill_3F - .4byte TrainerHill_4F - .4byte TrainerHill_Roof - .4byte NavelRock_Exterior - .4byte NavelRock_Harbor - .4byte NavelRock_Entrance - .4byte NavelRock_B1F - .4byte NavelRock_Fork - .4byte NavelRock_Up1 - .4byte NavelRock_Up2 - .4byte NavelRock_Up3 - .4byte NavelRock_Up4 - .4byte NavelRock_Top - .4byte NavelRock_Down01 - .4byte NavelRock_Down02 - .4byte NavelRock_Down03 - .4byte NavelRock_Down04 - .4byte NavelRock_Down05 - .4byte NavelRock_Down06 - .4byte NavelRock_Down07 - .4byte NavelRock_Down08 - .4byte NavelRock_Down09 - .4byte NavelRock_Down10 - .4byte NavelRock_Down11 - .4byte NavelRock_Bottom - .4byte TrainerHill_Elevator - -gMapGroup27: @ 8486520 - .4byte Route104_Prototype - .4byte Route104_PrototypePrettyPetalFlowerShop - -gMapGroup28: @ 8486528 - .4byte Route109_SeashoreHouse - -gMapGroup29: @ 848652C - .4byte Route110_TrickHouseEntrance - .4byte Route110_TrickHouseEnd - .4byte Route110_TrickHouseCorridor - .4byte Route110_TrickHousePuzzle1 - .4byte Route110_TrickHousePuzzle2 - .4byte Route110_TrickHousePuzzle3 - .4byte Route110_TrickHousePuzzle4 - .4byte Route110_TrickHousePuzzle5 - .4byte Route110_TrickHousePuzzle6 - .4byte Route110_TrickHousePuzzle7 - .4byte Route110_TrickHousePuzzle8 - .4byte Route110_SeasideCyclingRoadNorthEntrance - .4byte Route110_SeasideCyclingRoadSouthEntrance - -gMapGroup30: @ 8486560 - .4byte Route113_GlassWorkshop - -gMapGroup31: @ 8486564 - .4byte Route123_BerryMastersHouse - -gMapGroup32: @ 8486568 - .4byte Route119_WeatherInstitute_1F - .4byte Route119_WeatherInstitute_2F - .4byte Route119_House - -gMapGroup33: @ 8486574 - .4byte Route124_DivingTreasureHuntersHouse - - .align 2 -gMapGroups:: @ 8486578 - .4byte gMapGroup0 - .4byte gMapGroup1 - .4byte gMapGroup2 - .4byte gMapGroup3 - .4byte gMapGroup4 - .4byte gMapGroup5 - .4byte gMapGroup6 - .4byte gMapGroup7 - .4byte gMapGroup8 - .4byte gMapGroup9 - .4byte gMapGroup10 - .4byte gMapGroup11 - .4byte gMapGroup12 - .4byte gMapGroup13 - .4byte gMapGroup14 - .4byte gMapGroup15 - .4byte gMapGroup16 - .4byte gMapGroup17 - .4byte gMapGroup18 - .4byte gMapGroup19 - .4byte gMapGroup20 - .4byte gMapGroup21 - .4byte gMapGroup22 - .4byte gMapGroup23 - .4byte gMapGroup24 - .4byte gMapGroup25 - .4byte gMapGroup26 - .4byte gMapGroup27 - .4byte gMapGroup28 - .4byte gMapGroup29 - .4byte gMapGroup30 - .4byte gMapGroup31 - .4byte gMapGroup32 - .4byte gMapGroup33 - diff --git a/data/maps/headers.inc b/data/maps/headers.inc deleted file mode 100644 index b4be3ab0c2..0000000000 --- a/data/maps/headers.inc +++ /dev/null @@ -1,518 +0,0 @@ - .include "data/maps/PetalburgCity/header.inc" - .include "data/maps/SlateportCity/header.inc" - .include "data/maps/MauvilleCity/header.inc" - .include "data/maps/RustboroCity/header.inc" - .include "data/maps/FortreeCity/header.inc" - .include "data/maps/LilycoveCity/header.inc" - .include "data/maps/MossdeepCity/header.inc" - .include "data/maps/SootopolisCity/header.inc" - .include "data/maps/EverGrandeCity/header.inc" - .include "data/maps/LittlerootTown/header.inc" - .include "data/maps/OldaleTown/header.inc" - .include "data/maps/DewfordTown/header.inc" - .include "data/maps/LavaridgeTown/header.inc" - .include "data/maps/FallarborTown/header.inc" - .include "data/maps/VerdanturfTown/header.inc" - .include "data/maps/PacifidlogTown/header.inc" - .include "data/maps/Route101/header.inc" - .include "data/maps/Route102/header.inc" - .include "data/maps/Route103/header.inc" - .include "data/maps/Route104/header.inc" - .include "data/maps/Route105/header.inc" - .include "data/maps/Route106/header.inc" - .include "data/maps/Route107/header.inc" - .include "data/maps/Route108/header.inc" - .include "data/maps/Route109/header.inc" - .include "data/maps/Route110/header.inc" - .include "data/maps/Route111/header.inc" - .include "data/maps/Route112/header.inc" - .include "data/maps/Route113/header.inc" - .include "data/maps/Route114/header.inc" - .include "data/maps/Route115/header.inc" - .include "data/maps/Route116/header.inc" - .include "data/maps/Route117/header.inc" - .include "data/maps/Route118/header.inc" - .include "data/maps/Route119/header.inc" - .include "data/maps/Route120/header.inc" - .include "data/maps/Route121/header.inc" - .include "data/maps/Route122/header.inc" - .include "data/maps/Route123/header.inc" - .include "data/maps/Route124/header.inc" - .include "data/maps/Route125/header.inc" - .include "data/maps/Route126/header.inc" - .include "data/maps/Route127/header.inc" - .include "data/maps/Route128/header.inc" - .include "data/maps/Route129/header.inc" - .include "data/maps/Route130/header.inc" - .include "data/maps/Route131/header.inc" - .include "data/maps/Route132/header.inc" - .include "data/maps/Route133/header.inc" - .include "data/maps/Route134/header.inc" - .include "data/maps/Underwater1/header.inc" - .include "data/maps/Underwater2/header.inc" - .include "data/maps/Underwater3/header.inc" - .include "data/maps/Underwater4/header.inc" - .include "data/maps/Underwater5/header.inc" - .include "data/maps/Underwater6/header.inc" - .include "data/maps/Underwater7/header.inc" - .include "data/maps/LittlerootTown_BrendansHouse_1F/header.inc" - .include "data/maps/LittlerootTown_BrendansHouse_2F/header.inc" - .include "data/maps/LittlerootTown_MaysHouse_1F/header.inc" - .include "data/maps/LittlerootTown_MaysHouse_2F/header.inc" - .include "data/maps/LittlerootTown_ProfessorBirchsLab/header.inc" - .include "data/maps/OldaleTown_House1/header.inc" - .include "data/maps/OldaleTown_House2/header.inc" - .include "data/maps/OldaleTown_PokemonCenter_1F/header.inc" - .include "data/maps/OldaleTown_PokemonCenter_2F/header.inc" - .include "data/maps/OldaleTown_Mart/header.inc" - .include "data/maps/DewfordTown_House1/header.inc" - .include "data/maps/DewfordTown_PokemonCenter_1F/header.inc" - .include "data/maps/DewfordTown_PokemonCenter_2F/header.inc" - .include "data/maps/DewfordTown_Gym/header.inc" - .include "data/maps/DewfordTown_Hall/header.inc" - .include "data/maps/DewfordTown_House2/header.inc" - .include "data/maps/LavaridgeTown_HerbShop/header.inc" - .include "data/maps/LavaridgeTown_Gym_1F/header.inc" - .include "data/maps/LavaridgeTown_Gym_B1F/header.inc" - .include "data/maps/LavaridgeTown_House/header.inc" - .include "data/maps/LavaridgeTown_Mart/header.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_1F/header.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_2F/header.inc" - .include "data/maps/FallarborTown_Mart/header.inc" - .include "data/maps/FallarborTown_BattleTentLobby/header.inc" - .include "data/maps/FallarborTown_BattleTentCorridor/header.inc" - .include "data/maps/FallarborTown_BattleTentBattleRoom/header.inc" - .include "data/maps/FallarborTown_PokemonCenter_1F/header.inc" - .include "data/maps/FallarborTown_PokemonCenter_2F/header.inc" - .include "data/maps/FallarborTown_House1/header.inc" - .include "data/maps/FallarborTown_House2/header.inc" - .include "data/maps/VerdanturfTown_BattleTentLobby/header.inc" - .include "data/maps/VerdanturfTown_BattleTentCorridor/header.inc" - .include "data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc" - .include "data/maps/VerdanturfTown_Mart/header.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_1F/header.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_2F/header.inc" - .include "data/maps/VerdanturfTown_WandasHouse/header.inc" - .include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc" - .include "data/maps/VerdanturfTown_House/header.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_1F/header.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_2F/header.inc" - .include "data/maps/PacifidlogTown_House1/header.inc" - .include "data/maps/PacifidlogTown_House2/header.inc" - .include "data/maps/PacifidlogTown_House3/header.inc" - .include "data/maps/PacifidlogTown_House4/header.inc" - .include "data/maps/PacifidlogTown_House5/header.inc" - .include "data/maps/PetalburgCity_WallysHouse/header.inc" - .include "data/maps/PetalburgCity_Gym/header.inc" - .include "data/maps/PetalburgCity_House1/header.inc" - .include "data/maps/PetalburgCity_House2/header.inc" - .include "data/maps/PetalburgCity_PokemonCenter_1F/header.inc" - .include "data/maps/PetalburgCity_PokemonCenter_2F/header.inc" - .include "data/maps/PetalburgCity_Mart/header.inc" - .include "data/maps/SlateportCity_SternsShipyard_1F/header.inc" - .include "data/maps/SlateportCity_SternsShipyard_2F/header.inc" - .include "data/maps/SlateportCity_BattleTentLobby/header.inc" - .include "data/maps/SlateportCity_BattleTentCorridor/header.inc" - .include "data/maps/SlateportCity_BattleTentBattleRoom/header.inc" - .include "data/maps/SlateportCity_House1/header.inc" - .include "data/maps/SlateportCity_PokemonFanClub/header.inc" - .include "data/maps/SlateportCity_OceanicMuseum_1F/header.inc" - .include "data/maps/SlateportCity_OceanicMuseum_2F/header.inc" - .include "data/maps/SlateportCity_Harbor/header.inc" - .include "data/maps/SlateportCity_House2/header.inc" - .include "data/maps/SlateportCity_PokemonCenter_1F/header.inc" - .include "data/maps/SlateportCity_PokemonCenter_2F/header.inc" - .include "data/maps/SlateportCity_Mart/header.inc" - .include "data/maps/MauvilleCity_Gym/header.inc" - .include "data/maps/MauvilleCity_BikeShop/header.inc" - .include "data/maps/MauvilleCity_House1/header.inc" - .include "data/maps/MauvilleCity_GameCorner/header.inc" - .include "data/maps/MauvilleCity_House2/header.inc" - .include "data/maps/MauvilleCity_PokemonCenter_1F/header.inc" - .include "data/maps/MauvilleCity_PokemonCenter_2F/header.inc" - .include "data/maps/MauvilleCity_Mart/header.inc" - .include "data/maps/RustboroCity_DevonCorp_1F/header.inc" - .include "data/maps/RustboroCity_DevonCorp_2F/header.inc" - .include "data/maps/RustboroCity_DevonCorp_3F/header.inc" - .include "data/maps/RustboroCity_Gym/header.inc" - .include "data/maps/RustboroCity_PokemonSchool/header.inc" - .include "data/maps/RustboroCity_PokemonCenter_1F/header.inc" - .include "data/maps/RustboroCity_PokemonCenter_2F/header.inc" - .include "data/maps/RustboroCity_Mart/header.inc" - .include "data/maps/RustboroCity_Flat1_1F/header.inc" - .include "data/maps/RustboroCity_Flat1_2F/header.inc" - .include "data/maps/RustboroCity_House1/header.inc" - .include "data/maps/RustboroCity_CuttersHouse/header.inc" - .include "data/maps/RustboroCity_House2/header.inc" - .include "data/maps/RustboroCity_Flat2_1F/header.inc" - .include "data/maps/RustboroCity_Flat2_2F/header.inc" - .include "data/maps/RustboroCity_Flat2_3F/header.inc" - .include "data/maps/RustboroCity_House3/header.inc" - .include "data/maps/FortreeCity_House1/header.inc" - .include "data/maps/FortreeCity_Gym/header.inc" - .include "data/maps/FortreeCity_PokemonCenter_1F/header.inc" - .include "data/maps/FortreeCity_PokemonCenter_2F/header.inc" - .include "data/maps/FortreeCity_Mart/header.inc" - .include "data/maps/FortreeCity_House2/header.inc" - .include "data/maps/FortreeCity_House3/header.inc" - .include "data/maps/FortreeCity_House4/header.inc" - .include "data/maps/FortreeCity_House5/header.inc" - .include "data/maps/FortreeCity_DecorationShop/header.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc" - .include "data/maps/LilycoveCity_ContestLobby/header.inc" - .include "data/maps/LilycoveCity_ContestHall/header.inc" - .include "data/maps/LilycoveCity_PokemonCenter_1F/header.inc" - .include "data/maps/LilycoveCity_PokemonCenter_2F/header.inc" - .include "data/maps/LilycoveCity_UnusedMart/header.inc" - .include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc" - .include "data/maps/LilycoveCity_Harbor/header.inc" - .include "data/maps/LilycoveCity_MoveDeletersHouse/header.inc" - .include "data/maps/LilycoveCity_House1/header.inc" - .include "data/maps/LilycoveCity_House2/header.inc" - .include "data/maps/LilycoveCity_House3/header.inc" - .include "data/maps/LilycoveCity_House4/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_1F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_2F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_3F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_4F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_5F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc" - .include "data/maps/LilycoveCity_DepartmentStoreElevator/header.inc" - .include "data/maps/MossdeepCity_Gym/header.inc" - .include "data/maps/MossdeepCity_House1/header.inc" - .include "data/maps/MossdeepCity_House2/header.inc" - .include "data/maps/MossdeepCity_PokemonCenter_1F/header.inc" - .include "data/maps/MossdeepCity_PokemonCenter_2F/header.inc" - .include "data/maps/MossdeepCity_Mart/header.inc" - .include "data/maps/MossdeepCity_House3/header.inc" - .include "data/maps/MossdeepCity_StevensHouse/header.inc" - .include "data/maps/MossdeepCity_House4/header.inc" - .include "data/maps/MossdeepCity_SpaceCenter_1F/header.inc" - .include "data/maps/MossdeepCity_SpaceCenter_2F/header.inc" - .include "data/maps/MossdeepCity_GameCorner_1F/header.inc" - .include "data/maps/MossdeepCity_GameCorner_B1F/header.inc" - .include "data/maps/SootopolisCity_Gym_1F/header.inc" - .include "data/maps/SootopolisCity_Gym_B1F/header.inc" - .include "data/maps/SootopolisCity_PokemonCenter_1F/header.inc" - .include "data/maps/SootopolisCity_PokemonCenter_2F/header.inc" - .include "data/maps/SootopolisCity_Mart/header.inc" - .include "data/maps/SootopolisCity_House1/header.inc" - .include "data/maps/SootopolisCity_House2/header.inc" - .include "data/maps/SootopolisCity_House3/header.inc" - .include "data/maps/SootopolisCity_House4/header.inc" - .include "data/maps/SootopolisCity_House5/header.inc" - .include "data/maps/SootopolisCity_House6/header.inc" - .include "data/maps/SootopolisCity_House7/header.inc" - .include "data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc" - .include "data/maps/EverGrandeCity_SidneysRoom/header.inc" - .include "data/maps/EverGrandeCity_PhoebesRoom/header.inc" - .include "data/maps/EverGrandeCity_GlaciasRoom/header.inc" - .include "data/maps/EverGrandeCity_DrakesRoom/header.inc" - .include "data/maps/EverGrandeCity_ChampionsRoom/header.inc" - .include "data/maps/EverGrandeCity_Hall1/header.inc" - .include "data/maps/EverGrandeCity_Hall2/header.inc" - .include "data/maps/EverGrandeCity_Hall3/header.inc" - .include "data/maps/EverGrandeCity_Hall4/header.inc" - .include "data/maps/EverGrandeCity_Hall5/header.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_1F/header.inc" - .include "data/maps/EverGrandeCity_HallOfFame/header.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_1F/header.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_2F/header.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_2F/header.inc" - .include "data/maps/Route104_MrBrineysHouse/header.inc" - .include "data/maps/Route104_PrettyPetalFlowerShop/header.inc" - .include "data/maps/Route111_WinstrateFamilysHouse/header.inc" - .include "data/maps/Route111_OldLadysRestStop/header.inc" - .include "data/maps/Route112_CableCarStation/header.inc" - .include "data/maps/MtChimney_CableCarStation/header.inc" - .include "data/maps/Route114_FossilManiacsHouse/header.inc" - .include "data/maps/Route114_FossilManiacsTunnel/header.inc" - .include "data/maps/Route114_LanettesHouse/header.inc" - .include "data/maps/Route116_TunnelersRestHouse/header.inc" - .include "data/maps/Route117_PokemonDayCare/header.inc" - .include "data/maps/Route121_SafariZoneEntrance/header.inc" - .include "data/maps/MeteorFalls_1F_1R/header.inc" - .include "data/maps/MeteorFalls_1F_2R/header.inc" - .include "data/maps/MeteorFalls_B1F_1R/header.inc" - .include "data/maps/MeteorFalls_B1F_2R/header.inc" - .include "data/maps/RusturfTunnel/header.inc" - .include "data/maps/Underwater_SootopolisCity/header.inc" - .include "data/maps/DesertRuins/header.inc" - .include "data/maps/GraniteCave_1F/header.inc" - .include "data/maps/GraniteCave_B1F/header.inc" - .include "data/maps/GraniteCave_B2F/header.inc" - .include "data/maps/GraniteCave_StevensRoom/header.inc" - .include "data/maps/PetalburgWoods/header.inc" - .include "data/maps/MtChimney/header.inc" - .include "data/maps/JaggedPass/header.inc" - .include "data/maps/FieryPath/header.inc" - .include "data/maps/MtPyre_1F/header.inc" - .include "data/maps/MtPyre_2F/header.inc" - .include "data/maps/MtPyre_3F/header.inc" - .include "data/maps/MtPyre_4F/header.inc" - .include "data/maps/MtPyre_5F/header.inc" - .include "data/maps/MtPyre_6F/header.inc" - .include "data/maps/MtPyre_Exterior/header.inc" - .include "data/maps/MtPyre_Summit/header.inc" - .include "data/maps/AquaHideout_1F/header.inc" - .include "data/maps/AquaHideout_B1F/header.inc" - .include "data/maps/AquaHideout_B2F/header.inc" - .include "data/maps/Underwater_SeafloorCavern/header.inc" - .include "data/maps/SeafloorCavern_Entrance/header.inc" - .include "data/maps/SeafloorCavern_Room1/header.inc" - .include "data/maps/SeafloorCavern_Room2/header.inc" - .include "data/maps/SeafloorCavern_Room3/header.inc" - .include "data/maps/SeafloorCavern_Room4/header.inc" - .include "data/maps/SeafloorCavern_Room5/header.inc" - .include "data/maps/SeafloorCavern_Room6/header.inc" - .include "data/maps/SeafloorCavern_Room7/header.inc" - .include "data/maps/SeafloorCavern_Room8/header.inc" - .include "data/maps/SeafloorCavern_Room9/header.inc" - .include "data/maps/CaveOfOrigin_Entrance/header.inc" - .include "data/maps/CaveOfOrigin_1F/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc" - .include "data/maps/CaveOfOrigin_B1F/header.inc" - .include "data/maps/VictoryRoad_1F/header.inc" - .include "data/maps/VictoryRoad_B1F/header.inc" - .include "data/maps/VictoryRoad_B2F/header.inc" - .include "data/maps/ShoalCave_LowTideEntranceRoom/header.inc" - .include "data/maps/ShoalCave_LowTideInnerRoom/header.inc" - .include "data/maps/ShoalCave_LowTideStairsRoom/header.inc" - .include "data/maps/ShoalCave_LowTideLowerRoom/header.inc" - .include "data/maps/ShoalCave_HighTideEntranceRoom/header.inc" - .include "data/maps/ShoalCave_HighTideInnerRoom/header.inc" - .include "data/maps/NewMauville_Entrance/header.inc" - .include "data/maps/NewMauville_Inside/header.inc" - .include "data/maps/AbandonedShip_Deck/header.inc" - .include "data/maps/AbandonedShip_Corridors_1F/header.inc" - .include "data/maps/AbandonedShip_Rooms_1F/header.inc" - .include "data/maps/AbandonedShip_Corridors_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms2_B1F/header.inc" - .include "data/maps/AbandonedShip_Underwater1/header.inc" - .include "data/maps/AbandonedShip_Room_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms2_1F/header.inc" - .include "data/maps/AbandonedShip_CaptainsOffice/header.inc" - .include "data/maps/AbandonedShip_Underwater2/header.inc" - .include "data/maps/AbandonedShip_HiddenFloorCorridors/header.inc" - .include "data/maps/AbandonedShip_HiddenFloorRooms/header.inc" - .include "data/maps/IslandCave/header.inc" - .include "data/maps/AncientTomb/header.inc" - .include "data/maps/Underwater_Route134/header.inc" - .include "data/maps/Underwater_SealedChamber/header.inc" - .include "data/maps/SealedChamber_OuterRoom/header.inc" - .include "data/maps/SealedChamber_InnerRoom/header.inc" - .include "data/maps/ScorchedSlab/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap1/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap2/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap3/header.inc" - .include "data/maps/SkyPillar_Entrance/header.inc" - .include "data/maps/SkyPillar_Outside/header.inc" - .include "data/maps/SkyPillar_1F/header.inc" - .include "data/maps/SkyPillar_2F/header.inc" - .include "data/maps/SkyPillar_3F/header.inc" - .include "data/maps/SkyPillar_4F/header.inc" - .include "data/maps/ShoalCave_LowTideIceRoom/header.inc" - .include "data/maps/SkyPillar_5F/header.inc" - .include "data/maps/SkyPillar_Top/header.inc" - .include "data/maps/MagmaHideout_1F/header.inc" - .include "data/maps/MagmaHideout_2F_1R/header.inc" - .include "data/maps/MagmaHideout_2F_2R/header.inc" - .include "data/maps/MagmaHideout_3F_1R/header.inc" - .include "data/maps/MagmaHideout_3F_2R/header.inc" - .include "data/maps/MagmaHideout_4F/header.inc" - .include "data/maps/MagmaHideout_3F_3R/header.inc" - .include "data/maps/MagmaHideout_2F_3R/header.inc" - .include "data/maps/MirageTower_1F/header.inc" - .include "data/maps/MirageTower_2F/header.inc" - .include "data/maps/MirageTower_3F/header.inc" - .include "data/maps/MirageTower_4F/header.inc" - .include "data/maps/DesertUnderpass/header.inc" - .include "data/maps/ArtisanCave_B1F/header.inc" - .include "data/maps/ArtisanCave_1F/header.inc" - .include "data/maps/Underwater_MarineCave/header.inc" - .include "data/maps/MarineCave_Entrance/header.inc" - .include "data/maps/MarineCave_End/header.inc" - .include "data/maps/TerraCave_Entrance/header.inc" - .include "data/maps/TerraCave_End/header.inc" - .include "data/maps/AlteringCave/header.inc" - .include "data/maps/MeteorFalls_StevensCave/header.inc" - .include "data/maps/SecretBase_RedCave1/header.inc" - .include "data/maps/SecretBase_BrownCave1/header.inc" - .include "data/maps/SecretBase_BlueCave1/header.inc" - .include "data/maps/SecretBase_YellowCave1/header.inc" - .include "data/maps/SecretBase_Tree1/header.inc" - .include "data/maps/SecretBase_Shrub1/header.inc" - .include "data/maps/SecretBase_RedCave2/header.inc" - .include "data/maps/SecretBase_BrownCave2/header.inc" - .include "data/maps/SecretBase_BlueCave2/header.inc" - .include "data/maps/SecretBase_YellowCave2/header.inc" - .include "data/maps/SecretBase_Tree2/header.inc" - .include "data/maps/SecretBase_Shrub2/header.inc" - .include "data/maps/SecretBase_RedCave3/header.inc" - .include "data/maps/SecretBase_BrownCave3/header.inc" - .include "data/maps/SecretBase_BlueCave3/header.inc" - .include "data/maps/SecretBase_YellowCave3/header.inc" - .include "data/maps/SecretBase_Tree3/header.inc" - .include "data/maps/SecretBase_Shrub3/header.inc" - .include "data/maps/SecretBase_RedCave4/header.inc" - .include "data/maps/SecretBase_BrownCave4/header.inc" - .include "data/maps/SecretBase_BlueCave4/header.inc" - .include "data/maps/SecretBase_YellowCave4/header.inc" - .include "data/maps/SecretBase_Tree4/header.inc" - .include "data/maps/SecretBase_Shrub4/header.inc" - .include "data/maps/SingleBattleColosseum/header.inc" - .include "data/maps/TradeCenter/header.inc" - .include "data/maps/RecordCorner/header.inc" - .include "data/maps/DoubleBattleColosseum/header.inc" - .include "data/maps/LinkContestRoom1/header.inc" - .include "data/maps/UnknownMap_25_29/header.inc" - .include "data/maps/UnknownMap_25_30/header.inc" - .include "data/maps/UnknownMap_25_31/header.inc" - .include "data/maps/UnknownMap_25_32/header.inc" - .include "data/maps/UnknownMap_25_33/header.inc" - .include "data/maps/UnknownMap_25_34/header.inc" - .include "data/maps/LinkContestRoom2/header.inc" - .include "data/maps/LinkContestRoom3/header.inc" - .include "data/maps/LinkContestRoom4/header.inc" - .include "data/maps/LinkContestRoom5/header.inc" - .include "data/maps/LinkContestRoom6/header.inc" - .include "data/maps/InsideOfTruck/header.inc" - .include "data/maps/SSTidalCorridor/header.inc" - .include "data/maps/SSTidalLowerDeck/header.inc" - .include "data/maps/SSTidalRooms/header.inc" - .include "data/maps/BattlePyramidSquare01/header.inc" - .include "data/maps/BattlePyramidSquare02/header.inc" - .include "data/maps/BattlePyramidSquare03/header.inc" - .include "data/maps/BattlePyramidSquare04/header.inc" - .include "data/maps/BattlePyramidSquare05/header.inc" - .include "data/maps/BattlePyramidSquare06/header.inc" - .include "data/maps/BattlePyramidSquare07/header.inc" - .include "data/maps/BattlePyramidSquare08/header.inc" - .include "data/maps/BattlePyramidSquare09/header.inc" - .include "data/maps/BattlePyramidSquare10/header.inc" - .include "data/maps/BattlePyramidSquare11/header.inc" - .include "data/maps/BattlePyramidSquare12/header.inc" - .include "data/maps/BattlePyramidSquare13/header.inc" - .include "data/maps/BattlePyramidSquare14/header.inc" - .include "data/maps/BattlePyramidSquare15/header.inc" - .include "data/maps/BattlePyramidSquare16/header.inc" - .include "data/maps/UnionRoom/header.inc" - .include "data/maps/SafariZone_Northwest/header.inc" - .include "data/maps/SafariZone_North/header.inc" - .include "data/maps/SafariZone_Southwest/header.inc" - .include "data/maps/SafariZone_South/header.inc" - .include "data/maps/BattleFrontier_OutsideWest/header.inc" - .include "data/maps/BattleFrontier_BattleTowerLobby/header.inc" - .include "data/maps/BattleFrontier_BattleTowerElevator/header.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc" - .include "data/maps/SouthernIsland_Exterior/header.inc" - .include "data/maps/SouthernIsland_Interior/header.inc" - .include "data/maps/SafariZone_RestHouse/header.inc" - .include "data/maps/SafariZone_Northeast/header.inc" - .include "data/maps/SafariZone_Southeast/header.inc" - .include "data/maps/BattleFrontier_OutsideEast/header.inc" - .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor2/header.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc" - .include "data/maps/BattleFrontier_BattleDomeLobby/header.inc" - .include "data/maps/BattleFrontier_BattleDomeCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceCorridor/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidTop/header.inc" - .include "data/maps/BattleFrontier_BattleArenaLobby/header.inc" - .include "data/maps/BattleFrontier_BattleArenaCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryLobby/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePikeLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePikeCorridor/header.inc" - .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc" - .include "data/maps/BattleFrontier_RankingHall/header.inc" - .include "data/maps/BattleFrontier_Lounge1/header.inc" - .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc" - .include "data/maps/BattleFrontier_Lounge2/header.inc" - .include "data/maps/BattleFrontier_Lounge3/header.inc" - .include "data/maps/BattleFrontier_Lounge4/header.inc" - .include "data/maps/BattleFrontier_ScottsHouse/header.inc" - .include "data/maps/BattleFrontier_Lounge5/header.inc" - .include "data/maps/BattleFrontier_Lounge6/header.inc" - .include "data/maps/BattleFrontier_Lounge7/header.inc" - .include "data/maps/BattleFrontier_ReceptionGate/header.inc" - .include "data/maps/BattleFrontier_Lounge8/header.inc" - .include "data/maps/BattleFrontier_Lounge9/header.inc" - .include "data/maps/BattleFrontier_PokemonCenter_1F/header.inc" - .include "data/maps/BattleFrontier_PokemonCenter_2F/header.inc" - .include "data/maps/BattleFrontier_Mart/header.inc" - .include "data/maps/FarawayIsland_Entrance/header.inc" - .include "data/maps/FarawayIsland_Interior/header.inc" - .include "data/maps/BirthIsland_Exterior/header.inc" - .include "data/maps/BirthIsland_Harbor/header.inc" - .include "data/maps/TrainerHill_Entrance/header.inc" - .include "data/maps/TrainerHill_1F/header.inc" - .include "data/maps/TrainerHill_2F/header.inc" - .include "data/maps/TrainerHill_3F/header.inc" - .include "data/maps/TrainerHill_4F/header.inc" - .include "data/maps/TrainerHill_Roof/header.inc" - .include "data/maps/NavelRock_Exterior/header.inc" - .include "data/maps/NavelRock_Harbor/header.inc" - .include "data/maps/NavelRock_Entrance/header.inc" - .include "data/maps/NavelRock_B1F/header.inc" - .include "data/maps/NavelRock_Fork/header.inc" - .include "data/maps/NavelRock_Up1/header.inc" - .include "data/maps/NavelRock_Up2/header.inc" - .include "data/maps/NavelRock_Up3/header.inc" - .include "data/maps/NavelRock_Up4/header.inc" - .include "data/maps/NavelRock_Top/header.inc" - .include "data/maps/NavelRock_Down01/header.inc" - .include "data/maps/NavelRock_Down02/header.inc" - .include "data/maps/NavelRock_Down03/header.inc" - .include "data/maps/NavelRock_Down04/header.inc" - .include "data/maps/NavelRock_Down05/header.inc" - .include "data/maps/NavelRock_Down06/header.inc" - .include "data/maps/NavelRock_Down07/header.inc" - .include "data/maps/NavelRock_Down08/header.inc" - .include "data/maps/NavelRock_Down09/header.inc" - .include "data/maps/NavelRock_Down10/header.inc" - .include "data/maps/NavelRock_Down11/header.inc" - .include "data/maps/NavelRock_Bottom/header.inc" - .include "data/maps/TrainerHill_Elevator/header.inc" - .include "data/maps/Route104_Prototype/header.inc" - .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc" - .include "data/maps/Route109_SeashoreHouse/header.inc" - .include "data/maps/Route110_TrickHouseEntrance/header.inc" - .include "data/maps/Route110_TrickHouseEnd/header.inc" - .include "data/maps/Route110_TrickHouseCorridor/header.inc" - .include "data/maps/Route110_TrickHousePuzzle1/header.inc" - .include "data/maps/Route110_TrickHousePuzzle2/header.inc" - .include "data/maps/Route110_TrickHousePuzzle3/header.inc" - .include "data/maps/Route110_TrickHousePuzzle4/header.inc" - .include "data/maps/Route110_TrickHousePuzzle5/header.inc" - .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_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" - .include "data/maps/Route119_WeatherInstitute_2F/header.inc" - .include "data/maps/Route119_House/header.inc" - .include "data/maps/Route124_DivingTreasureHuntersHouse/header.inc" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json new file mode 100644 index 0000000000..e20d1adf24 --- /dev/null +++ b/data/maps/map_groups.json @@ -0,0 +1,691 @@ +{ + "group_order": [ + "gMapGroup0", + "gMapGroup1", + "gMapGroup2", + "gMapGroup3", + "gMapGroup4", + "gMapGroup5", + "gMapGroup6", + "gMapGroup7", + "gMapGroup8", + "gMapGroup9", + "gMapGroup10", + "gMapGroup11", + "gMapGroup12", + "gMapGroup13", + "gMapGroup14", + "gMapGroup15", + "gMapGroup16", + "gMapGroup17", + "gMapGroup18", + "gMapGroup19", + "gMapGroup20", + "gMapGroup21", + "gMapGroup22", + "gMapGroup23", + "gMapGroup24", + "gMapGroup25", + "gMapGroup26", + "gMapGroup27", + "gMapGroup28", + "gMapGroup29", + "gMapGroup30", + "gMapGroup31", + "gMapGroup32", + "gMapGroup33" + ], + "gMapGroup0": [ + "PetalburgCity", + "SlateportCity", + "MauvilleCity", + "RustboroCity", + "FortreeCity", + "LilycoveCity", + "MossdeepCity", + "SootopolisCity", + "EverGrandeCity", + "LittlerootTown", + "OldaleTown", + "DewfordTown", + "LavaridgeTown", + "FallarborTown", + "VerdanturfTown", + "PacifidlogTown", + "Route101", + "Route102", + "Route103", + "Route104", + "Route105", + "Route106", + "Route107", + "Route108", + "Route109", + "Route110", + "Route111", + "Route112", + "Route113", + "Route114", + "Route115", + "Route116", + "Route117", + "Route118", + "Route119", + "Route120", + "Route121", + "Route122", + "Route123", + "Route124", + "Route125", + "Route126", + "Route127", + "Route128", + "Route129", + "Route130", + "Route131", + "Route132", + "Route133", + "Route134", + "Underwater1", + "Underwater2", + "Underwater3", + "Underwater4", + "Underwater5", + "Underwater6", + "Underwater7" + ], + "gMapGroup1": [ + "LittlerootTown_BrendansHouse_1F", + "LittlerootTown_BrendansHouse_2F", + "LittlerootTown_MaysHouse_1F", + "LittlerootTown_MaysHouse_2F", + "LittlerootTown_ProfessorBirchsLab" + ], + "gMapGroup2": [ + "OldaleTown_House1", + "OldaleTown_House2", + "OldaleTown_PokemonCenter_1F", + "OldaleTown_PokemonCenter_2F", + "OldaleTown_Mart" + ], + "gMapGroup3": [ + "DewfordTown_House1", + "DewfordTown_PokemonCenter_1F", + "DewfordTown_PokemonCenter_2F", + "DewfordTown_Gym", + "DewfordTown_Hall", + "DewfordTown_House2" + ], + "gMapGroup4": [ + "LavaridgeTown_HerbShop", + "LavaridgeTown_Gym_1F", + "LavaridgeTown_Gym_B1F", + "LavaridgeTown_House", + "LavaridgeTown_Mart", + "LavaridgeTown_PokemonCenter_1F", + "LavaridgeTown_PokemonCenter_2F" + ], + "gMapGroup5": [ + "FallarborTown_Mart", + "FallarborTown_BattleTentLobby", + "FallarborTown_BattleTentCorridor", + "FallarborTown_BattleTentBattleRoom", + "FallarborTown_PokemonCenter_1F", + "FallarborTown_PokemonCenter_2F", + "FallarborTown_House1", + "FallarborTown_House2" + ], + "gMapGroup6": [ + "VerdanturfTown_BattleTentLobby", + "VerdanturfTown_BattleTentCorridor", + "VerdanturfTown_BattleTentBattleRoom", + "VerdanturfTown_Mart", + "VerdanturfTown_PokemonCenter_1F", + "VerdanturfTown_PokemonCenter_2F", + "VerdanturfTown_WandasHouse", + "VerdanturfTown_FriendshipRatersHouse", + "VerdanturfTown_House" + ], + "gMapGroup7": [ + "PacifidlogTown_PokemonCenter_1F", + "PacifidlogTown_PokemonCenter_2F", + "PacifidlogTown_House1", + "PacifidlogTown_House2", + "PacifidlogTown_House3", + "PacifidlogTown_House4", + "PacifidlogTown_House5" + ], + "gMapGroup8": [ + "PetalburgCity_WallysHouse", + "PetalburgCity_Gym", + "PetalburgCity_House1", + "PetalburgCity_House2", + "PetalburgCity_PokemonCenter_1F", + "PetalburgCity_PokemonCenter_2F", + "PetalburgCity_Mart" + ], + "gMapGroup9": [ + "SlateportCity_SternsShipyard_1F", + "SlateportCity_SternsShipyard_2F", + "SlateportCity_BattleTentLobby", + "SlateportCity_BattleTentCorridor", + "SlateportCity_BattleTentBattleRoom", + "SlateportCity_House1", + "SlateportCity_PokemonFanClub", + "SlateportCity_OceanicMuseum_1F", + "SlateportCity_OceanicMuseum_2F", + "SlateportCity_Harbor", + "SlateportCity_House2", + "SlateportCity_PokemonCenter_1F", + "SlateportCity_PokemonCenter_2F", + "SlateportCity_Mart" + ], + "gMapGroup10": [ + "MauvilleCity_Gym", + "MauvilleCity_BikeShop", + "MauvilleCity_House1", + "MauvilleCity_GameCorner", + "MauvilleCity_House2", + "MauvilleCity_PokemonCenter_1F", + "MauvilleCity_PokemonCenter_2F", + "MauvilleCity_Mart" + ], + "gMapGroup11": [ + "RustboroCity_DevonCorp_1F", + "RustboroCity_DevonCorp_2F", + "RustboroCity_DevonCorp_3F", + "RustboroCity_Gym", + "RustboroCity_PokemonSchool", + "RustboroCity_PokemonCenter_1F", + "RustboroCity_PokemonCenter_2F", + "RustboroCity_Mart", + "RustboroCity_Flat1_1F", + "RustboroCity_Flat1_2F", + "RustboroCity_House1", + "RustboroCity_CuttersHouse", + "RustboroCity_House2", + "RustboroCity_Flat2_1F", + "RustboroCity_Flat2_2F", + "RustboroCity_Flat2_3F", + "RustboroCity_House3" + ], + "gMapGroup12": [ + "FortreeCity_House1", + "FortreeCity_Gym", + "FortreeCity_PokemonCenter_1F", + "FortreeCity_PokemonCenter_2F", + "FortreeCity_Mart", + "FortreeCity_House2", + "FortreeCity_House3", + "FortreeCity_House4", + "FortreeCity_House5", + "FortreeCity_DecorationShop" + ], + "gMapGroup13": [ + "LilycoveCity_CoveLilyMotel_1F", + "LilycoveCity_CoveLilyMotel_2F", + "LilycoveCity_LilycoveMuseum_1F", + "LilycoveCity_LilycoveMuseum_2F", + "LilycoveCity_ContestLobby", + "LilycoveCity_ContestHall", + "LilycoveCity_PokemonCenter_1F", + "LilycoveCity_PokemonCenter_2F", + "LilycoveCity_UnusedMart", + "LilycoveCity_PokemonTrainerFanClub", + "LilycoveCity_Harbor", + "LilycoveCity_MoveDeletersHouse", + "LilycoveCity_House1", + "LilycoveCity_House2", + "LilycoveCity_House3", + "LilycoveCity_House4", + "LilycoveCity_DepartmentStore_1F", + "LilycoveCity_DepartmentStore_2F", + "LilycoveCity_DepartmentStore_3F", + "LilycoveCity_DepartmentStore_4F", + "LilycoveCity_DepartmentStore_5F", + "LilycoveCity_DepartmentStoreRooftop", + "LilycoveCity_DepartmentStoreElevator" + ], + "gMapGroup14": [ + "MossdeepCity_Gym", + "MossdeepCity_House1", + "MossdeepCity_House2", + "MossdeepCity_PokemonCenter_1F", + "MossdeepCity_PokemonCenter_2F", + "MossdeepCity_Mart", + "MossdeepCity_House3", + "MossdeepCity_StevensHouse", + "MossdeepCity_House4", + "MossdeepCity_SpaceCenter_1F", + "MossdeepCity_SpaceCenter_2F", + "MossdeepCity_GameCorner_1F", + "MossdeepCity_GameCorner_B1F" + ], + "gMapGroup15": [ + "SootopolisCity_Gym_1F", + "SootopolisCity_Gym_B1F", + "SootopolisCity_PokemonCenter_1F", + "SootopolisCity_PokemonCenter_2F", + "SootopolisCity_Mart", + "SootopolisCity_House1", + "SootopolisCity_House2", + "SootopolisCity_House3", + "SootopolisCity_House4", + "SootopolisCity_House5", + "SootopolisCity_House6", + "SootopolisCity_House7", + "SootopolisCity_LotadAndSeedotHouse", + "SootopolisCity_MysteryEventsHouse_1F", + "SootopolisCity_MysteryEventsHouse_B1F" + ], + "gMapGroup16": [ + "EverGrandeCity_SidneysRoom", + "EverGrandeCity_PhoebesRoom", + "EverGrandeCity_GlaciasRoom", + "EverGrandeCity_DrakesRoom", + "EverGrandeCity_ChampionsRoom", + "EverGrandeCity_Hall1", + "EverGrandeCity_Hall2", + "EverGrandeCity_Hall3", + "EverGrandeCity_Hall4", + "EverGrandeCity_Hall5", + "EverGrandeCity_PokemonLeague_1F", + "EverGrandeCity_HallOfFame", + "EverGrandeCity_PokemonCenter_1F", + "EverGrandeCity_PokemonCenter_2F", + "EverGrandeCity_PokemonLeague_2F" + ], + "gMapGroup17": [ + "Route104_MrBrineysHouse", + "Route104_PrettyPetalFlowerShop" + ], + "gMapGroup18": [ + "Route111_WinstrateFamilysHouse", + "Route111_OldLadysRestStop" + ], + "gMapGroup19": [ + "Route112_CableCarStation", + "MtChimney_CableCarStation" + ], + "gMapGroup20": [ + "Route114_FossilManiacsHouse", + "Route114_FossilManiacsTunnel", + "Route114_LanettesHouse" + ], + "gMapGroup21": [ + "Route116_TunnelersRestHouse" + ], + "gMapGroup22": [ + "Route117_PokemonDayCare" + ], + "gMapGroup23": [ + "Route121_SafariZoneEntrance" + ], + "gMapGroup24": [ + "MeteorFalls_1F_1R", + "MeteorFalls_1F_2R", + "MeteorFalls_B1F_1R", + "MeteorFalls_B1F_2R", + "RusturfTunnel", + "Underwater_SootopolisCity", + "DesertRuins", + "GraniteCave_1F", + "GraniteCave_B1F", + "GraniteCave_B2F", + "GraniteCave_StevensRoom", + "PetalburgWoods", + "MtChimney", + "JaggedPass", + "FieryPath", + "MtPyre_1F", + "MtPyre_2F", + "MtPyre_3F", + "MtPyre_4F", + "MtPyre_5F", + "MtPyre_6F", + "MtPyre_Exterior", + "MtPyre_Summit", + "AquaHideout_1F", + "AquaHideout_B1F", + "AquaHideout_B2F", + "Underwater_SeafloorCavern", + "SeafloorCavern_Entrance", + "SeafloorCavern_Room1", + "SeafloorCavern_Room2", + "SeafloorCavern_Room3", + "SeafloorCavern_Room4", + "SeafloorCavern_Room5", + "SeafloorCavern_Room6", + "SeafloorCavern_Room7", + "SeafloorCavern_Room8", + "SeafloorCavern_Room9", + "CaveOfOrigin_Entrance", + "CaveOfOrigin_1F", + "CaveOfOrigin_UnusedRubySapphireMap1", + "CaveOfOrigin_UnusedRubySapphireMap2", + "CaveOfOrigin_UnusedRubySapphireMap3", + "CaveOfOrigin_B1F", + "VictoryRoad_1F", + "VictoryRoad_B1F", + "VictoryRoad_B2F", + "ShoalCave_LowTideEntranceRoom", + "ShoalCave_LowTideInnerRoom", + "ShoalCave_LowTideStairsRoom", + "ShoalCave_LowTideLowerRoom", + "ShoalCave_HighTideEntranceRoom", + "ShoalCave_HighTideInnerRoom", + "NewMauville_Entrance", + "NewMauville_Inside", + "AbandonedShip_Deck", + "AbandonedShip_Corridors_1F", + "AbandonedShip_Rooms_1F", + "AbandonedShip_Corridors_B1F", + "AbandonedShip_Rooms_B1F", + "AbandonedShip_Rooms2_B1F", + "AbandonedShip_Underwater1", + "AbandonedShip_Room_B1F", + "AbandonedShip_Rooms2_1F", + "AbandonedShip_CaptainsOffice", + "AbandonedShip_Underwater2", + "AbandonedShip_HiddenFloorCorridors", + "AbandonedShip_HiddenFloorRooms", + "IslandCave", + "AncientTomb", + "Underwater_Route134", + "Underwater_SealedChamber", + "SealedChamber_OuterRoom", + "SealedChamber_InnerRoom", + "ScorchedSlab", + "AquaHideout_UnusedRubyMap1", + "AquaHideout_UnusedRubyMap2", + "AquaHideout_UnusedRubyMap3", + "SkyPillar_Entrance", + "SkyPillar_Outside", + "SkyPillar_1F", + "SkyPillar_2F", + "SkyPillar_3F", + "SkyPillar_4F", + "ShoalCave_LowTideIceRoom", + "SkyPillar_5F", + "SkyPillar_Top", + "MagmaHideout_1F", + "MagmaHideout_2F_1R", + "MagmaHideout_2F_2R", + "MagmaHideout_3F_1R", + "MagmaHideout_3F_2R", + "MagmaHideout_4F", + "MagmaHideout_3F_3R", + "MagmaHideout_2F_3R", + "MirageTower_1F", + "MirageTower_2F", + "MirageTower_3F", + "MirageTower_4F", + "DesertUnderpass", + "ArtisanCave_B1F", + "ArtisanCave_1F", + "Underwater_MarineCave", + "MarineCave_Entrance", + "MarineCave_End", + "TerraCave_Entrance", + "TerraCave_End", + "AlteringCave", + "MeteorFalls_StevensCave" + ], + "gMapGroup25": [ + "SecretBase_RedCave1", + "SecretBase_BrownCave1", + "SecretBase_BlueCave1", + "SecretBase_YellowCave1", + "SecretBase_Tree1", + "SecretBase_Shrub1", + "SecretBase_RedCave2", + "SecretBase_BrownCave2", + "SecretBase_BlueCave2", + "SecretBase_YellowCave2", + "SecretBase_Tree2", + "SecretBase_Shrub2", + "SecretBase_RedCave3", + "SecretBase_BrownCave3", + "SecretBase_BlueCave3", + "SecretBase_YellowCave3", + "SecretBase_Tree3", + "SecretBase_Shrub3", + "SecretBase_RedCave4", + "SecretBase_BrownCave4", + "SecretBase_BlueCave4", + "SecretBase_YellowCave4", + "SecretBase_Tree4", + "SecretBase_Shrub4", + "SingleBattleColosseum", + "TradeCenter", + "RecordCorner", + "DoubleBattleColosseum", + "LinkContestRoom1", + "UnknownMap_25_29", + "UnknownMap_25_30", + "UnknownMap_25_31", + "UnknownMap_25_32", + "UnknownMap_25_33", + "UnknownMap_25_34", + "LinkContestRoom2", + "LinkContestRoom3", + "LinkContestRoom4", + "LinkContestRoom5", + "LinkContestRoom6", + "InsideOfTruck", + "SSTidalCorridor", + "SSTidalLowerDeck", + "SSTidalRooms", + "BattlePyramidSquare01", + "BattlePyramidSquare02", + "BattlePyramidSquare03", + "BattlePyramidSquare04", + "BattlePyramidSquare05", + "BattlePyramidSquare06", + "BattlePyramidSquare07", + "BattlePyramidSquare08", + "BattlePyramidSquare09", + "BattlePyramidSquare10", + "BattlePyramidSquare11", + "BattlePyramidSquare12", + "BattlePyramidSquare13", + "BattlePyramidSquare14", + "BattlePyramidSquare15", + "BattlePyramidSquare16", + "UnionRoom" + ], + "gMapGroup26": [ + "SafariZone_Northwest", + "SafariZone_North", + "SafariZone_Southwest", + "SafariZone_South", + "BattleFrontier_OutsideWest", + "BattleFrontier_BattleTowerLobby", + "BattleFrontier_BattleTowerElevator", + "BattleFrontier_BattleTowerCorridor", + "BattleFrontier_BattleTowerBattleRoom", + "SouthernIsland_Exterior", + "SouthernIsland_Interior", + "SafariZone_RestHouse", + "SafariZone_Northeast", + "SafariZone_Southeast", + "BattleFrontier_OutsideEast", + "BattleFrontier_BattleTowerMultiBattleRoom", + "BattleFrontier_BattleTowerCorridor2", + "BattleFrontier_BattleTowerBattleRoom2", + "BattleFrontier_BattleDomeLobby", + "BattleFrontier_BattleDomeCorridor", + "BattleFrontier_BattleDomePreBattleRoom", + "BattleFrontier_BattleDomeBattleRoom", + "BattleFrontier_BattlePalaceLobby", + "BattleFrontier_BattlePalaceCorridor", + "BattleFrontier_BattlePalaceBattleRoom", + "BattleFrontier_BattlePyramidLobby", + "BattleFrontier_BattlePyramidEmptySquare", + "BattleFrontier_BattlePyramidTop", + "BattleFrontier_BattleArenaLobby", + "BattleFrontier_BattleArenaCorridor", + "BattleFrontier_BattleArenaBattleRoom", + "BattleFrontier_BattleFactoryLobby", + "BattleFrontier_BattleFactoryPreBattleRoom", + "BattleFrontier_BattleFactoryBattleRoom", + "BattleFrontier_BattlePikeLobby", + "BattleFrontier_BattlePikeCorridor", + "BattleFrontier_BattlePikeThreePathRoom", + "BattleFrontier_BattlePikeRandomRoom1", + "BattleFrontier_BattlePikeRandomRoom2", + "BattleFrontier_BattlePikeRandomRoom3", + "BattleFrontier_RankingHall", + "BattleFrontier_Lounge1", + "BattleFrontier_BattlePointExchangeServiceCorner", + "BattleFrontier_Lounge2", + "BattleFrontier_Lounge3", + "BattleFrontier_Lounge4", + "BattleFrontier_ScottsHouse", + "BattleFrontier_Lounge5", + "BattleFrontier_Lounge6", + "BattleFrontier_Lounge7", + "BattleFrontier_ReceptionGate", + "BattleFrontier_Lounge8", + "BattleFrontier_Lounge9", + "BattleFrontier_PokemonCenter_1F", + "BattleFrontier_PokemonCenter_2F", + "BattleFrontier_Mart", + "FarawayIsland_Entrance", + "FarawayIsland_Interior", + "BirthIsland_Exterior", + "BirthIsland_Harbor", + "TrainerHill_Entrance", + "TrainerHill_1F", + "TrainerHill_2F", + "TrainerHill_3F", + "TrainerHill_4F", + "TrainerHill_Roof", + "NavelRock_Exterior", + "NavelRock_Harbor", + "NavelRock_Entrance", + "NavelRock_B1F", + "NavelRock_Fork", + "NavelRock_Up1", + "NavelRock_Up2", + "NavelRock_Up3", + "NavelRock_Up4", + "NavelRock_Top", + "NavelRock_Down01", + "NavelRock_Down02", + "NavelRock_Down03", + "NavelRock_Down04", + "NavelRock_Down05", + "NavelRock_Down06", + "NavelRock_Down07", + "NavelRock_Down08", + "NavelRock_Down09", + "NavelRock_Down10", + "NavelRock_Down11", + "NavelRock_Bottom", + "TrainerHill_Elevator" + ], + "gMapGroup27": [ + "Route104_Prototype", + "Route104_PrototypePrettyPetalFlowerShop" + ], + "gMapGroup28": [ + "Route109_SeashoreHouse" + ], + "gMapGroup29": [ + "Route110_TrickHouseEntrance", + "Route110_TrickHouseEnd", + "Route110_TrickHouseCorridor", + "Route110_TrickHousePuzzle1", + "Route110_TrickHousePuzzle2", + "Route110_TrickHousePuzzle3", + "Route110_TrickHousePuzzle4", + "Route110_TrickHousePuzzle5", + "Route110_TrickHousePuzzle6", + "Route110_TrickHousePuzzle7", + "Route110_TrickHousePuzzle8", + "Route110_SeasideCyclingRoadNorthEntrance", + "Route110_SeasideCyclingRoadSouthEntrance" + ], + "gMapGroup30": [ + "Route113_GlassWorkshop" + ], + "gMapGroup31": [ + "Route123_BerryMastersHouse" + ], + "gMapGroup32": [ + "Route119_WeatherInstitute_1F", + "Route119_WeatherInstitute_2F", + "Route119_House" + ], + "gMapGroup33": [ + "Route124_DivingTreasureHuntersHouse" + ], + "connections_include_order": [ + "LittlerootTown", + "OldaleTown", + "DewfordTown", + "LavaridgeTown", + "FallarborTown", + "VerdanturfTown", + "PacifidlogTown", + "PetalburgCity", + "SlateportCity", + "MauvilleCity", + "RustboroCity", + "FortreeCity", + "LilycoveCity", + "MossdeepCity", + "SootopolisCity", + "EverGrandeCity", + "Route101", + "Route102", + "Route103", + "Route104", + "Route105", + "Route106", + "Route107", + "Route108", + "Route109", + "Route110", + "Route111", + "Route112", + "Route113", + "Route114", + "Route115", + "Route116", + "Route117", + "Route118", + "Route119", + "Route120", + "Route121", + "Route122", + "Route123", + "Route124", + "Route125", + "Route126", + "Route127", + "Route128", + "Route129", + "Route130", + "Route131", + "Route132", + "Route133", + "Route134", + "Underwater6", + "Underwater1", + "Underwater7", + "Underwater2", + "Underwater3", + "Underwater4", + "Underwater5", + "SafariZone_Northwest", + "SafariZone_North", + "SafariZone_Southwest", + "SafariZone_South", + "SafariZone_Northeast", + "SafariZone_Southeast", + "BattleFrontier_OutsideWest", + "BattleFrontier_OutsideEast" + ] +} \ No newline at end of file diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d12db9b33f..45b37ff8bf 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -443,4 +443,4 @@ #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 #define LAYOUT_UNKNOWN_MAP_08481DBC 441 -#endif // GUARD_CONSTANTS_LAYOUTS_H +#endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h new file mode 100755 index 0000000000..003b8c6ce6 --- /dev/null +++ b/include/constants/map_groups.h @@ -0,0 +1,592 @@ +#ifndef GUARD_CONSTANTS_MAP_GROUPS_H +#define GUARD_CONSTANTS_MAP_GROUPS_H + +// Map Group 0 +#define MAP_PETALBURG_CITY (0 | (0 << 8)) +#define MAP_SLATEPORT_CITY (1 | (0 << 8)) +#define MAP_MAUVILLE_CITY (2 | (0 << 8)) +#define MAP_RUSTBORO_CITY (3 | (0 << 8)) +#define MAP_FORTREE_CITY (4 | (0 << 8)) +#define MAP_LILYCOVE_CITY (5 | (0 << 8)) +#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) +#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) +#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) +#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) +#define MAP_OLDALE_TOWN (10 | (0 << 8)) +#define MAP_DEWFORD_TOWN (11 | (0 << 8)) +#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) +#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) +#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) +#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) +#define MAP_ROUTE101 (16 | (0 << 8)) +#define MAP_ROUTE102 (17 | (0 << 8)) +#define MAP_ROUTE103 (18 | (0 << 8)) +#define MAP_ROUTE104 (19 | (0 << 8)) +#define MAP_ROUTE105 (20 | (0 << 8)) +#define MAP_ROUTE106 (21 | (0 << 8)) +#define MAP_ROUTE107 (22 | (0 << 8)) +#define MAP_ROUTE108 (23 | (0 << 8)) +#define MAP_ROUTE109 (24 | (0 << 8)) +#define MAP_ROUTE110 (25 | (0 << 8)) +#define MAP_ROUTE111 (26 | (0 << 8)) +#define MAP_ROUTE112 (27 | (0 << 8)) +#define MAP_ROUTE113 (28 | (0 << 8)) +#define MAP_ROUTE114 (29 | (0 << 8)) +#define MAP_ROUTE115 (30 | (0 << 8)) +#define MAP_ROUTE116 (31 | (0 << 8)) +#define MAP_ROUTE117 (32 | (0 << 8)) +#define MAP_ROUTE118 (33 | (0 << 8)) +#define MAP_ROUTE119 (34 | (0 << 8)) +#define MAP_ROUTE120 (35 | (0 << 8)) +#define MAP_ROUTE121 (36 | (0 << 8)) +#define MAP_ROUTE122 (37 | (0 << 8)) +#define MAP_ROUTE123 (38 | (0 << 8)) +#define MAP_ROUTE124 (39 | (0 << 8)) +#define MAP_ROUTE125 (40 | (0 << 8)) +#define MAP_ROUTE126 (41 | (0 << 8)) +#define MAP_ROUTE127 (42 | (0 << 8)) +#define MAP_ROUTE128 (43 | (0 << 8)) +#define MAP_ROUTE129 (44 | (0 << 8)) +#define MAP_ROUTE130 (45 | (0 << 8)) +#define MAP_ROUTE131 (46 | (0 << 8)) +#define MAP_ROUTE132 (47 | (0 << 8)) +#define MAP_ROUTE133 (48 | (0 << 8)) +#define MAP_ROUTE134 (49 | (0 << 8)) +#define MAP_UNDERWATER1 (50 | (0 << 8)) +#define MAP_UNDERWATER2 (51 | (0 << 8)) +#define MAP_UNDERWATER3 (52 | (0 << 8)) +#define MAP_UNDERWATER4 (53 | (0 << 8)) +#define MAP_UNDERWATER5 (54 | (0 << 8)) +#define MAP_UNDERWATER6 (55 | (0 << 8)) +#define MAP_UNDERWATER7 (56 | (0 << 8)) + +// Map Group 1 +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8)) + +// Map Group 2 +#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8)) +#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8)) +#define MAP_OLDALE_TOWN_MART (4 | (2 << 8)) + +// Map Group 3 +#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8)) +#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8)) +#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8)) +#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8)) + +// Map Group 4 +#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8)) + +// Map Group 5 +#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_HOUSE1 (6 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_HOUSE2 (7 | (5 << 8)) + +// Map Group 6 +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_MART (3 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_HOUSE (8 | (6 << 8)) + +// Map Group 7 +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8)) + +// Map Group 8 +#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8)) +#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8)) +#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8)) +#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8)) +#define MAP_PETALBURG_CITY_MART (6 | (8 << 8)) + +// Map Group 9 +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8)) +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE1 (5 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE2 (10 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) +#define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) + +// Map Group 10 +#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8)) +#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8)) +#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8)) +#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8)) + +// Map Group 11 +#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8)) +#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) +#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8)) +#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8)) + +// Map Group 12 +#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8)) +#define MAP_FORTREE_CITY_GYM (1 | (12 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8)) +#define MAP_FORTREE_CITY_MART (4 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8)) +#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8)) + +// Map Group 13 +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8)) +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8)) +#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8)) +#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8)) + +// Map Group 14 +#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) + +// Map Group 15 +#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) + +// Map Group 16 +#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8)) +#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_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)) +#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8)) + +// Map Group 17 +#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8)) +#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8)) + +// Map Group 18 +#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8)) +#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8)) + +// Map Group 19 +#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8)) +#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8)) + +// Map Group 20 +#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8)) +#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8)) +#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8)) + +// Map Group 21 +#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8)) + +// Map Group 22 +#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8)) + +// Map Group 23 +#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8)) + +// Map Group 24 +#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8)) +#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8)) +#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8)) +#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8)) +#define MAP_RUSTURF_TUNNEL (4 | (24 << 8)) +#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8)) +#define MAP_DESERT_RUINS (6 | (24 << 8)) +#define MAP_GRANITE_CAVE_1F (7 | (24 << 8)) +#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8)) +#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8)) +#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8)) +#define MAP_PETALBURG_WOODS (11 | (24 << 8)) +#define MAP_MT_CHIMNEY (12 | (24 << 8)) +#define MAP_JAGGED_PASS (13 | (24 << 8)) +#define MAP_FIERY_PATH (14 | (24 << 8)) +#define MAP_MT_PYRE_1F (15 | (24 << 8)) +#define MAP_MT_PYRE_2F (16 | (24 << 8)) +#define MAP_MT_PYRE_3F (17 | (24 << 8)) +#define MAP_MT_PYRE_4F (18 | (24 << 8)) +#define MAP_MT_PYRE_5F (19 | (24 << 8)) +#define MAP_MT_PYRE_6F (20 | (24 << 8)) +#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8)) +#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8)) +#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8)) +#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_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) +#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)) +#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8)) +#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8)) +#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8)) +#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8)) +#define MAP_ISLAND_CAVE (67 | (24 << 8)) +#define MAP_ANCIENT_TOMB (68 | (24 << 8)) +#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8)) +#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8)) +#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8)) +#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8)) +#define MAP_SCORCHED_SLAB (73 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 (74 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 (75 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 (76 | (24 << 8)) +#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8)) +#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8)) +#define MAP_SKY_PILLAR_1F (79 | (24 << 8)) +#define MAP_SKY_PILLAR_2F (80 | (24 << 8)) +#define MAP_SKY_PILLAR_3F (81 | (24 << 8)) +#define MAP_SKY_PILLAR_4F (82 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8)) +#define MAP_SKY_PILLAR_5F (84 | (24 << 8)) +#define MAP_SKY_PILLAR_TOP (85 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_1F (86 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_4F (91 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (24 << 8)) +#define MAP_MIRAGE_TOWER_1F (94 | (24 << 8)) +#define MAP_MIRAGE_TOWER_2F (95 | (24 << 8)) +#define MAP_MIRAGE_TOWER_3F (96 | (24 << 8)) +#define MAP_MIRAGE_TOWER_4F (97 | (24 << 8)) +#define MAP_DESERT_UNDERPASS (98 | (24 << 8)) +#define MAP_ARTISAN_CAVE_B1F (99 | (24 << 8)) +#define MAP_ARTISAN_CAVE_1F (100 | (24 << 8)) +#define MAP_UNDERWATER_MARINE_CAVE (101 | (24 << 8)) +#define MAP_MARINE_CAVE_ENTRANCE (102 | (24 << 8)) +#define MAP_MARINE_CAVE_END (103 | (24 << 8)) +#define MAP_TERRA_CAVE_ENTRANCE (104 | (24 << 8)) +#define MAP_TERRA_CAVE_END (105 | (24 << 8)) +#define MAP_ALTERING_CAVE (106 | (24 << 8)) +#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) + +// Map Group 25 +#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) +#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) +#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) +#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) +#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) +#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) +#define MAP_TRADE_CENTER (25 | (25 << 8)) +#define MAP_RECORD_CORNER (26 | (25 << 8)) +#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) +#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) +#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) +#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) +#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) +#define MAP_UNION_ROOM (60 | (25 << 8)) + +// Map Group 26 +#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) +#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) +#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) +#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) +#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) +#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) +#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) +#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) +#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) +#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) +#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) +#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) +#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) +#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) +#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) +#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) +#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) +#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) + +// Map Group 27 +#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) +#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8)) + +// Map Group 28 +#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8)) + +// Map Group 29 +#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 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_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)) + +// Map Group 31 +#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8)) + +// Map Group 32 +#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8)) +#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8)) +#define MAP_ROUTE119_HOUSE (2 | (32 << 8)) + +// Map Group 33 +#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) + +#define MAP_GROUPS_COUNT 34 + +#endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/include/constants/maps.h b/include/constants/maps.h index c65f373afd..e1e2da9923 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -1,598 +1,11 @@ #ifndef GUARD_CONSTANTS_MAPS_H #define GUARD_CONSTANTS_MAPS_H -// Map Group 0 -#define MAP_PETALBURG_CITY (0 | (0 << 8)) -#define MAP_SLATEPORT_CITY (1 | (0 << 8)) -#define MAP_MAUVILLE_CITY (2 | (0 << 8)) -#define MAP_RUSTBORO_CITY (3 | (0 << 8)) -#define MAP_FORTREE_CITY (4 | (0 << 8)) -#define MAP_LILYCOVE_CITY (5 | (0 << 8)) -#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) -#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) -#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) -#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) -#define MAP_OLDALE_TOWN (10 | (0 << 8)) -#define MAP_DEWFORD_TOWN (11 | (0 << 8)) -#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) -#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) -#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) -#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) -#define MAP_ROUTE101 (16 | (0 << 8)) -#define MAP_ROUTE102 (17 | (0 << 8)) -#define MAP_ROUTE103 (18 | (0 << 8)) -#define MAP_ROUTE104 (19 | (0 << 8)) -#define MAP_ROUTE105 (20 | (0 << 8)) -#define MAP_ROUTE106 (21 | (0 << 8)) -#define MAP_ROUTE107 (22 | (0 << 8)) -#define MAP_ROUTE108 (23 | (0 << 8)) -#define MAP_ROUTE109 (24 | (0 << 8)) -#define MAP_ROUTE110 (25 | (0 << 8)) -#define MAP_ROUTE111 (26 | (0 << 8)) -#define MAP_ROUTE112 (27 | (0 << 8)) -#define MAP_ROUTE113 (28 | (0 << 8)) -#define MAP_ROUTE114 (29 | (0 << 8)) -#define MAP_ROUTE115 (30 | (0 << 8)) -#define MAP_ROUTE116 (31 | (0 << 8)) -#define MAP_ROUTE117 (32 | (0 << 8)) -#define MAP_ROUTE118 (33 | (0 << 8)) -#define MAP_ROUTE119 (34 | (0 << 8)) -#define MAP_ROUTE120 (35 | (0 << 8)) -#define MAP_ROUTE121 (36 | (0 << 8)) -#define MAP_ROUTE122 (37 | (0 << 8)) -#define MAP_ROUTE123 (38 | (0 << 8)) -#define MAP_ROUTE124 (39 | (0 << 8)) -#define MAP_ROUTE125 (40 | (0 << 8)) -#define MAP_ROUTE126 (41 | (0 << 8)) -#define MAP_ROUTE127 (42 | (0 << 8)) -#define MAP_ROUTE128 (43 | (0 << 8)) -#define MAP_ROUTE129 (44 | (0 << 8)) -#define MAP_ROUTE130 (45 | (0 << 8)) -#define MAP_ROUTE131 (46 | (0 << 8)) -#define MAP_ROUTE132 (47 | (0 << 8)) -#define MAP_ROUTE133 (48 | (0 << 8)) -#define MAP_ROUTE134 (49 | (0 << 8)) -#define MAP_UNDERWATER1 (50 | (0 << 8)) -#define MAP_UNDERWATER2 (51 | (0 << 8)) -#define MAP_UNDERWATER3 (52 | (0 << 8)) -#define MAP_UNDERWATER4 (53 | (0 << 8)) -#define MAP_UNDERWATER5 (54 | (0 << 8)) -#define MAP_UNDERWATER6 (55 | (0 << 8)) -#define MAP_UNDERWATER7 (56 | (0 << 8)) - -// Map Group 1 -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8)) - -// Map Group 2 -#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8)) -#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8)) -#define MAP_OLDALE_TOWN_MART (4 | (2 << 8)) - -// Map Group 3 -#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8)) -#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8)) - -// Map Group 4 -#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8)) - -// Map Group 5 -#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_HOUSE1 (6 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_HOUSE2 (7 | (5 << 8)) - -// Map Group 6 -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_MART (3 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_HOUSE (8 | (6 << 8)) - -// Map Group 7 -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8)) - -// Map Group 8 -#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8)) -#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8)) -#define MAP_PETALBURG_CITY_MART (6 | (8 << 8)) - -// Map Group 9 -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8)) -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE1 (5 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE2 (10 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) -#define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) - -// Map Group 10 -#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8)) -#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8)) -#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8)) -#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8)) - -// Map Group 11 -#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8)) -#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) -#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8)) -#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8)) - -// Map Group 12 -#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8)) -#define MAP_FORTREE_CITY_GYM (1 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8)) -#define MAP_FORTREE_CITY_MART (4 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8)) -#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8)) - -// Map Group 13 -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8)) -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8)) -#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8)) -#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8)) - -// Map Group 14 -#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) - -// Map Group 15 -#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) - -// Map Group 16 -#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8)) -#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_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)) -#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8)) - -// Map Group 17 -#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8)) -#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8)) - -// Map Group 18 -#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8)) -#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8)) - -// Map Group 19 -#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8)) -#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8)) - -// Map Group 20 -#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8)) -#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8)) -#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8)) - -// Map Group 21 -#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8)) - -// Map Group 22 -#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8)) - -// Map Group 23 -#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8)) - -// Map Group 24 -#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8)) -#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8)) -#define MAP_RUSTURF_TUNNEL (4 | (24 << 8)) -#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8)) -#define MAP_DESERT_RUINS (6 | (24 << 8)) -#define MAP_GRANITE_CAVE_1F (7 | (24 << 8)) -#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8)) -#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8)) -#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8)) -#define MAP_PETALBURG_WOODS (11 | (24 << 8)) -#define MAP_MT_CHIMNEY (12 | (24 << 8)) -#define MAP_JAGGED_PASS (13 | (24 << 8)) -#define MAP_FIERY_PATH (14 | (24 << 8)) -#define MAP_MT_PYRE_1F (15 | (24 << 8)) -#define MAP_MT_PYRE_2F (16 | (24 << 8)) -#define MAP_MT_PYRE_3F (17 | (24 << 8)) -#define MAP_MT_PYRE_4F (18 | (24 << 8)) -#define MAP_MT_PYRE_5F (19 | (24 << 8)) -#define MAP_MT_PYRE_6F (20 | (24 << 8)) -#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8)) -#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8)) -#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8)) -#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_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)) -#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8)) -#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8)) -#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8)) -#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8)) -#define MAP_ISLAND_CAVE (67 | (24 << 8)) -#define MAP_ANCIENT_TOMB (68 | (24 << 8)) -#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8)) -#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8)) -#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8)) -#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8)) -#define MAP_SCORCHED_SLAB (73 | (24 << 8)) -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_1F (74 | (24 << 8)) // -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B1F (75 | (24 << 8)) // Ruby/Sapphire leftovers -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B2F (76 | (24 << 8)) // -#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8)) -#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8)) -#define MAP_SKY_PILLAR_1F (79 | (24 << 8)) -#define MAP_SKY_PILLAR_2F (80 | (24 << 8)) -#define MAP_SKY_PILLAR_3F (81 | (24 << 8)) -#define MAP_SKY_PILLAR_4F (82 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8)) -#define MAP_SKY_PILLAR_5F (84 | (24 << 8)) -#define MAP_SKY_PILLAR_TOP (85 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_1F (86 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_4F (91 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (24 << 8)) -#define MAP_MIRAGE_TOWER_1F (94 | (24 << 8)) -#define MAP_MIRAGE_TOWER_2F (95 | (24 << 8)) -#define MAP_MIRAGE_TOWER_3F (96 | (24 << 8)) -#define MAP_MIRAGE_TOWER_4F (97 | (24 << 8)) -#define MAP_DESERT_UNDERPASS (98 | (24 << 8)) -#define MAP_ARTISAN_CAVE_B1F (99 | (24 << 8)) -#define MAP_ARTISAN_CAVE_1F (100 | (24 << 8)) -#define MAP_UNDERWATER_MARINE_CAVE (101 | (24 << 8)) -#define MAP_MARINE_CAVE_ENTRANCE (102 | (24 << 8)) -#define MAP_MARINE_CAVE_END (103 | (24 << 8)) -#define MAP_TERRA_CAVE_ENTRANCE (104 | (24 << 8)) -#define MAP_TERRA_CAVE_END (105 | (24 << 8)) -#define MAP_ALTERING_CAVE (106 | (24 << 8)) -#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) - -// Map Group 25 -#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) -#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) -#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) -#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) -#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) -#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) -#define MAP_TRADE_CENTER (25 | (25 << 8)) -#define MAP_RECORD_CORNER (26 | (25 << 8)) -#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) -#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) -#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) -#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) -#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) -#define MAP_UNION_ROOM (60 | (25 << 8)) - -// Map Group 26 -#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) -#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) -#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) -#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) -#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) -#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) -#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) -#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) -#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) -#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) -#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) -#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) -#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) -#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) -#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) -#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) -#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) -#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) - -// Map Group 27 -#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) -#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8)) - -// Map Group 28 -#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8)) - -// Map Group 29 -#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 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_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)) - -// Map Group 31 -#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8)) - -// Map Group 32 -#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8)) -#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8)) -#define MAP_ROUTE119_HOUSE (2 | (32 << 8)) - -// Map Group 33 -#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) - -#define MAP_GROUPS_COUNT 34 +#include "map_groups.h" #define MAP_NONE (0x7F | (0x7F << 8)) #define MAP_UNDEFINED (0xFF | (0xFF << 8)) - #define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_NUM(map) (MAP_##map & 0xFF) diff --git a/map_data_rules.mk b/map_data_rules.mk new file mode 100755 index 0000000000..6d133eb504 --- /dev/null +++ b/map_data_rules.mk @@ -0,0 +1,31 @@ +# Map JSON data + +MAPS_DIR = $(DATA_ASM_SUBDIR)/maps +LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts + +MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/)) +MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS)) +MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS)) +MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS)) + +$(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc $(MAPS_DIR)/headers.inc $(MAPS_DIR)/groups.inc $(MAPS_DIR)/connections.inc $(MAP_CONNECTIONS) $(MAP_HEADERS) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ +$(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/events.inc $(MAP_EVENTS) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ + +$(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json + $(MAPJSON) map $< $(LAYOUTS_DIR)/layouts.json +$(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ; +$(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ; + +$(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json + $(MAPJSON) groups $< +$(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ; +$(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ; +$(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ; +include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ; + +$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json + $(MAPJSON) layouts $< +$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; +include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; diff --git a/src/battle_factory.c b/src/battle_factory.c index 5793c78e9f..c025dc139c 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -11,6 +11,7 @@ #include "constants/species.h" #include "constants/battle_ai.h" #include "constants/battle_frontier.h" +#include "constants/layouts.h" #include "constants/trainers.h" #include "constants/moves.h" @@ -662,7 +663,8 @@ static u8 GetStyleForMove(u16 move) bool8 sub_81A6BF4(void) { - return (gMapHeader.mapLayoutId == 347 || gMapHeader.mapLayoutId == 348); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM; } static void sub_81A6C1C(void) diff --git a/src/battle_pike.c b/src/battle_pike.c index c12038efb3..bdf6e80278 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -16,6 +16,7 @@ #include "constants/event_objects.h" #include "constants/battle_frontier.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/rgb.h" #include "constants/trainers.h" #include "constants/species.h" @@ -1314,8 +1315,10 @@ static void sub_81A8090(void) bool8 InBattlePike(void) { - return (gMapHeader.mapLayoutId == 351 || gMapHeader.mapLayoutId == 352 - || gMapHeader.mapLayoutId == 358 || gMapHeader.mapLayoutId == 359); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 + || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; } static void sub_81A80DC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index c0ff1ecf58..ed911d8d96 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -30,6 +30,7 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/species.h" @@ -1380,9 +1381,9 @@ u8 GetPyramidRunMultiplier(void) u8 InBattlePyramid(void) { - if (gMapHeader.mapLayoutId == 361) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) return 1; - else if (gMapHeader.mapLayoutId == 378) + else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) return 2; else return FALSE; @@ -1390,7 +1391,8 @@ u8 InBattlePyramid(void) bool8 InBattlePyramid_(void) { - return (gMapHeader.mapLayoutId == 361 || gMapHeader.mapLayoutId == 378); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP; } void sub_81A9E90(void) diff --git a/src/battle_tent.c b/src/battle_tent.c index de4d9d374a..cb8149253f 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -12,6 +12,7 @@ #include "frontier_util.h" #include "string_util.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/region_map_sections.h" #include "constants/species.h" @@ -270,8 +271,8 @@ static void sub_81B9E88(void) bool8 sub_81B9E94(void) { - return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY - && ((gMapHeader.mapLayoutId == 385) | (gMapHeader.mapLayoutId == 386))); + return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY + && (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM); } static void sub_81B9EC0(void) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index c137470066..0d88815c00 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -1,6 +1,4 @@ #include "global.h" -#include "constants/region_map_sections.h" -#include "constants/weather.h" #include "bg.h" #include "event_data.h" #include "gpu_regs.h" @@ -14,6 +12,9 @@ #include "string_util.h" #include "task.h" #include "text.h" +#include "constants/layouts.h" +#include "constants/region_map_sections.h" +#include "constants/weather.h" // enums enum MapPopUp_Themes @@ -305,7 +306,7 @@ static void ShowMapNamePopUpWindow(void) if (InBattlePyramid()) { - if (gMapHeader.mapLayoutId == 0x17A) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) { withoutPrefixPtr = &(mapDisplayHeader[3]); mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7]; diff --git a/src/overworld.c b/src/overworld.c index a67b4b68f6..8d4c24ff6f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -55,6 +55,7 @@ #include "wild_encounter.h" #include "frontier_util.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/region_map_sections.h" @@ -886,7 +887,7 @@ static void mli0_load_map(u32 a1) LoadCurrentMapData(); if (!(sUnknown_020322D8 & 1)) { - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA1D8(); else if (InTrainerHill()) sub_81D5DF8(); @@ -914,7 +915,7 @@ static void mli0_load_map(u32 a1) mapheader_run_script_with_tag_x3(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(0); else if (InTrainerHill()) InitTrainerHillMap(); @@ -1753,7 +1754,7 @@ void CB2_ContinueSavedGame(void) LoadSaveblockMapHeader(); ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA2F8(); else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); @@ -1763,7 +1764,7 @@ void CB2_ContinueSavedGame(void) UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(1); else if (trainerHillMapId != 0) InitTrainerHillMap(); diff --git a/src/pokemon.c b/src/pokemon.c index cdb87f464f..7f80e8d4ef 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -37,6 +37,7 @@ #include "constants/battle_move_effects.h" #include "constants/hold_effects.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -6848,7 +6849,7 @@ void SetWildMonHeldItem(void) var1 = 20; var2 = 80; } - if (gMapHeader.mapLayoutId == 0x1A4) + if (gMapHeader.mapLayoutId == LAYOUT_ALTERING_CAVE) { s32 alteringCaveId = GetWildMonTableIdInAlteringCave(species); if (alteringCaveId != 0) diff --git a/src/trainer_hill.c b/src/trainer_hill.c index e0a236286e..309ffdb1d7 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -24,6 +24,7 @@ #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/moves.h" #include "constants/maps.h" #include "constants/species.h" @@ -324,7 +325,7 @@ void ResetTrainerHillResults(void) static u8 GetFloorId(void) { - return gMapHeader.mapLayoutId - 159; + return gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; } u8 GetTrainerHillOpponentClass(u16 trainerId) @@ -385,7 +386,7 @@ static void SetUpDataStruct(void) if (sHillData == NULL) { sHillData = AllocZeroed(sizeof(*sHillData)); - sHillData->floorId = gMapHeader.mapLayoutId - 159; + sHillData->floorId = gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; CpuCopy32(sDataPerTag[gSaveBlock1Ptr->trainerHill.tag], &sHillData->tag, sizeof(sHillData->tag)); nullsub_2(); } @@ -803,10 +804,10 @@ bool32 InTrainerHill(void) { bool32 ret; - if (gMapHeader.mapLayoutId == 0x19F - || gMapHeader.mapLayoutId == 0x1A0 - || gMapHeader.mapLayoutId == 0x1A1 - || gMapHeader.mapLayoutId == 0x1A2) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F) ret = TRUE; else ret = FALSE; @@ -818,17 +819,17 @@ u8 GetCurrentTrainerHillMapId(void) { u8 ret; - if (gMapHeader.mapLayoutId == 0x19F) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F) ret = 1; - else if (gMapHeader.mapLayoutId == 0x1A0) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F) ret = 2; - else if (gMapHeader.mapLayoutId == 0x1A1) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F) ret = 3; - else if (gMapHeader.mapLayoutId == 0x1A2) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F) ret = 4; - else if (gMapHeader.mapLayoutId == 0x1A3) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF) ret = 5; - else if (gMapHeader.mapLayoutId == 0x19E) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ENTRANCE) ret = 6; else ret = 0; @@ -840,7 +841,7 @@ static bool32 sub_81D6100(void) { bool32 ret; - if (gMapHeader.mapLayoutId == 0x1A3) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF) ret = TRUE; else ret = FALSE; diff --git a/src/tv.c b/src/tv.c index 5b640836f1..ec3a3d0cb4 100644 --- a/src/tv.c +++ b/src/tv.c @@ -38,6 +38,7 @@ #include "secret_base.h" #include "tv.h" #include "data2.h" +#include "constants/layouts.h" // Static type declarations @@ -6264,7 +6265,9 @@ static void DoTVShowTodaysRivalTrainer(void) case MAPSEC_DYNAMIC: switch (show->rivalTrainer.mapLayoutId) { - case 0x115 ... 0x117: + case LAYOUT_SS_TIDAL_CORRIDOR: + case LAYOUT_SS_TIDAL_LOWER_DECK: + case LAYOUT_SS_TIDAL_ROOMS: sTVShowState = 10; break; default: @@ -6463,7 +6466,9 @@ static void DoTVShowHoennTreasureInvestigators(void) { switch (show->treasureInvestigators.mapLayoutId) { - case 0x115 ... 0x117: + case LAYOUT_SS_TIDAL_CORRIDOR: + case LAYOUT_SS_TIDAL_LOWER_DECK: + case LAYOUT_SS_TIDAL_ROOMS: sTVShowState = 2; break; default: diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 2e6f1642a8..e42bf8a232 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1,27 +1,27 @@ #include "global.h" #include "wild_encounter.h" #include "pokemon.h" -#include "constants/species.h" #include "metatile_behavior.h" #include "fieldmap.h" #include "random.h" -#include "constants/maps.h" #include "field_player_avatar.h" -#include "constants/abilities.h" #include "event_data.h" #include "safari_zone.h" #include "overworld.h" #include "pokeblock.h" #include "battle_setup.h" #include "roamer.h" -#include "constants/game_stat.h" #include "tv.h" #include "link.h" #include "script.h" #include "battle_pike.h" #include "battle_pyramid.h" +#include "constants/abilities.h" +#include "constants/game_stat.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/maps.h" +#include "constants/species.h" extern const u8 EventScript_RepelWoreOff[]; @@ -413,7 +413,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.mapLayoutId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) + if (gMapHeader.mapLayoutId != LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) return FALSE; CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level); @@ -474,7 +474,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility) { u32 ability = GetMonAbility(&gPlayerParty[0]); - if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == 0x169) + if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) encounterRate = encounterRate * 3 / 4; else if (ability == ABILITY_STENCH) encounterRate /= 2; @@ -522,7 +522,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == 0x166) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) { headerId = GetBattlePikeWildMonHeaderId(); if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -537,7 +537,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) { headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -665,7 +665,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == 0x166) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) { headerId = GetBattlePikeWildMonHeaderId(); if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) @@ -675,7 +675,7 @@ bool8 SweetScentWildEncounter(void) BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) { headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) diff --git a/tools/mapjson/mapjson.py b/tools/mapjson/mapjson.py new file mode 100755 index 0000000000..28322a2de2 --- /dev/null +++ b/tools/mapjson/mapjson.py @@ -0,0 +1,389 @@ +# mapjson.py + +import os +import re +import sys +import json + + +def abort(message): + print message + sys.exit() + + +def write_text_file(filepath, text): + with open(filepath, 'w') as f: + f.write(text) + + +def generate_map_header_text(map_data, layouts_data): + matched_layouts = filter(lambda layout: layout['id'] == map_data['layout'], layouts_data['layouts']) + if len(matched_layouts) != 1: + abort('Failed to find matching layout for "%s"' % (map_data['layout'])) + layout = matched_layouts[0] + text = '%s:\n' % (map_data['name']) + text += '\t.4byte %s\n' % (layout['name']) + + if 'shared_events_map' in map_data: + text += '\t.4byte %s\n' % (map_data['shared_events_map'] + '_MapEvents') + else: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapEvents') + + if 'shared_scripts_map' in map_data: + text += '\t.4byte %s\n' % (map_data['shared_scripts_map'] + '_MapScripts') + else: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapScripts') + + if map_data['connections'] is not None and len(map_data['connections']) > 0: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapConnections') + else: + text += '\t.4byte 0x0\n' + + text += '\t.2byte %s\n' % (map_data['music']) + text += '\t.2byte %s\n' % (layout['id']) + text += '\t.byte %s\n' % (map_data['region_map_section']) + text += '\t.byte %s\n' % (int(map_data['requires_flash'])) + text += '\t.byte %s\n' % (map_data['weather']) + text += '\t.byte %s\n' % (map_data['map_type']) + text += '\t.2byte 0\n' + text += '\tmap_header_flags allow_bike=%s, allow_escape_rope=%s, allow_run=%s, show_map_name=%s\n' % (int(map_data['allow_bike']), int(map_data['allow_escape_rope']), int(map_data['allow_running']), int(map_data['show_map_name'])) + text += '\t.byte %s\n\n' % (map_data['battle_scene']) + return text + + +def generate_map_connections_text(map_data): + if map_data['connections'] is None: + return '\n' + + label = '%s_MapConnectionsList' % (map_data['name']) + text = '%s:\n' % (label) + for connection in map_data['connections']: + text += '\tconnection %s, %s, %s\n' % (connection['direction'], connection['offset'], connection['map']) + + text += '\n%s_MapConnections:\n' % (map_data['name']) + text += '\t.4byte %s\n' % (len(map_data['connections'])) + text += '\t.4byte %s\n\n' % (label) + return text + + +def generate_map_events_text(map_data): + if 'shared_events_map' in map_data: + return '\n' + + text = '' + if len(map_data['object_events']) > 0: + objects_label = '%s_EventObjects' % (map_data['name']) + text += '%s:\n' % (objects_label) + for i, obj in enumerate(map_data['object_events']): + text += '\tobject_event %s, %s, 0, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s\n' % ( + i + 1, + obj['graphics_id'], + obj['x'], + obj['y'], + obj['elevation'], + obj['movement_type'], + obj['movement_range_x'], + obj['movement_range_y'], + obj['trainer_type'], + obj['trainer_sight_or_berry_tree_id'], + obj['script'], + obj['flag']) + text += '\n' + else: + objects_label = '0x0' + + if len(map_data['warp_events']) > 0: + warps_label = '%s_MapWarps' % (map_data['name']) + text += '%s:\n' % (warps_label) + for i, warp in enumerate(map_data['warp_events']): + text += '\twarp_def %s, %s, %s, %s, %s\n' % ( + warp['x'], + warp['y'], + warp['elevation'], + warp['dest_warp_id'], + warp['dest_map']) + text += '\n' + else: + warps_label = '0x0' + + if len(map_data['coord_events']) > 0: + coords_label = '%s_MapCoordEvents' % (map_data['name']) + text += '%s:\n' % (coords_label) + for i, event in enumerate(map_data['coord_events']): + if event['type'] == 'trigger': + text += '\tcoord_event %s, %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['var'], + event['var_value'], + event['script']) + elif event['type'] == 'weather': + text += '\tcoord_weather_event %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['weather']) + text += '\n' + else: + coords_label = '0x0' + + if len(map_data['bg_events']) > 0: + bgs_label = '%s_MapBGEvents' % (map_data['name']) + text += '%s:\n' % (bgs_label) + for i, event in enumerate(map_data['bg_events']): + if event['type'] == 'sign': + text += '\tbg_event %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['player_facing_dir'], + event['script']) + elif event['type'] == 'hidden_item': + text += '\tbg_hidden_item_event %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['item'], + event['flag']) + elif event['type'] == 'secret_base': + text += '\tbg_secret_base_event %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['secret_base_id']) + text += '\n' + else: + bgs_label = '0x0' + + text += '%s_MapEvents::\n' % (map_data['name']) + text += '\tmap_events %s, %s, %s, %s\n\n' % (objects_label, warps_label, coords_label, bgs_label) + return text + + +def process_map(map_filepath, layouts_filepath): + with open(map_filepath) as f: + map_data = json.load(f) + with open(layouts_filepath) as f: + layouts_data = json.load(f) + + header_text = generate_map_header_text(map_data, layouts_data) + events_text = generate_map_events_text(map_data) + connections_text = generate_map_connections_text(map_data) + + files_dir = os.path.dirname(map_filepath) + write_text_file(os.path.join(files_dir, 'header.inc'), header_text) + write_text_file(os.path.join(files_dir, 'events.inc'), events_text) + write_text_file(os.path.join(files_dir, 'connections.inc'), connections_text) + + +def generate_groups_text(groups_data): + text = '' + for group in groups_data['group_order']: + text += '%s::\n' % (group) + maps = groups_data[group] + for map_name in maps: + text += '\t.4byte %s\n' % (map_name) + text += '\n' + + text += '\t.align 2\n' + text += 'gMapGroups::\n' + for group in groups_data['group_order']: + text += '\t.4byte %s\n' % (group) + text += '\n' + return text + + +def index_of(in_list, value): + try: + index_value = in_list.index(value) + except ValueError: + index_value = sys.maxint + return index_value + + +def generate_connections_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + if 'connections_include_order' in groups_data: + map_names.sort(key=lambda x: index_of(groups_data['connections_include_order'], x)) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/connections.inc"\n' % (map_name) + + return text + + +def generate_headers_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/header.inc"\n' % (map_name) + + return text + + +def generate_events_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/events.inc"\n' % (map_name) + + return text + + +def generate_map_constants_text(groups_filepath, groups_data): + file_dir = os.path.dirname(groups_filepath) + text = '#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n' + text += '#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n' + + for i, group in enumerate(groups_data['group_order']): + text += '// Map Group %s\n' % (i) + map_ids = [] + max_length = 0 + for map_name in groups_data[group]: + header_filepath = os.path.join(file_dir, map_name, 'map.json') + with open(header_filepath) as f: + map_data = json.load(f) + map_ids.append(map_data['id']) + if len(map_data['id']) > max_length: + max_length = len(map_data['id']) + + for j, map_id in enumerate(map_ids): + text += '#define %s%s(%s | (%s << 8))\n' % (map_id, " " * (max_length - len(map_id) + 1), j, i) + + text += '\n' + + text += '#define MAP_GROUPS_COUNT %s\n\n' % (len(groups_data['group_order'])) + text += '#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n' + + return text + + +def process_groups(groups_filepath): + with open(groups_filepath) as f: + groups_data = json.load(f) + + groups_text = generate_groups_text(groups_data) + connections_text = generate_connections_text(groups_data) + headers_text = generate_headers_text(groups_data) + events_text = generate_events_text(groups_data) + map_header_text = generate_map_constants_text(groups_filepath, groups_data) + + file_dir = os.path.dirname(groups_filepath) + write_text_file(os.path.join(file_dir, 'groups.inc'), groups_text) + write_text_file(os.path.join(file_dir, 'connections.inc'), connections_text) + write_text_file(os.path.join(file_dir, 'headers.inc'), headers_text) + write_text_file(os.path.join(file_dir, 'events.inc'), events_text) + write_text_file(os.path.join(file_dir, '../../include/constants/map_groups.h'), map_header_text) + + +def generate_layout_headers_text(layouts_data): + text = '' + for layout in layouts_data['layouts']: + border_label = layout['name'] + '_Border' + blockdata_label = layout['name'] + '_Blockdata' + text += '%s::\n' % (border_label) + text += '\t.incbin "%s"\n\n' % (layout['border_filepath']) + text += '%s::\n' % (blockdata_label) + text += '\t.incbin "%s"\n\n' % (layout['blockdata_filepath']) + text += '\t.align 2\n' + text += '%s::\n' % (layout['name']) + text += '\t.4byte %s\n' % (layout['width']) + text += '\t.4byte %s\n' % (layout['height']) + text += '\t.4byte %s\n' % (border_label) + text += '\t.4byte %s\n' % (blockdata_label) + text += '\t.4byte %s\n' % (layout['primary_tileset']) + text += '\t.4byte %s\n\n' % (layout['secondary_tileset']) + + return text + + +def generate_layouts_table_text(layouts_data): + text = '\t.align 2\n' + text += '%s::\n' % (layouts_data['layouts_table_label']) + for layout in layouts_data['layouts']: + text += '\t.4byte %s\n' % (layout['name']) + + return text + + +def generate_layouts_constants_text(layouts_data): + text = '#ifndef GUARD_CONSTANTS_LAYOUTS_H\n' + text += '#define GUARD_CONSTANTS_LAYOUTS_H\n\n' + for i, layout in enumerate(layouts_data['layouts']): + text += '#define %s %s\n' % (layout['id'], i + 1) + text += '\n' + text += '#endif // GUARD_CONSTANTS_LAYOUTS_H\n' + return text + + +def process_layouts(layouts_filepath): + with open(layouts_filepath) as f: + layouts_data = json.load(f) + + layout_headers_text = generate_layout_headers_text(layouts_data) + layouts_table_text = generate_layouts_table_text(layouts_data) + layouts_constants_text = generate_layouts_constants_text(layouts_data) + + file_dir = os.path.dirname(layouts_filepath) + write_text_file(os.path.join(file_dir, 'layouts.inc'), layout_headers_text) + write_text_file(os.path.join(file_dir, 'layouts_table.inc'), layouts_table_text) + write_text_file(os.path.join(file_dir, '../../include/constants/layouts.h'), layouts_constants_text) + + +def main(): + if len(sys.argv) < 2: + abort('USAGE: python mapjson.py [options]') + + mode = sys.argv[1] + if mode not in ['layouts', 'map', 'groups']: + abort("ERROR: must be 'layouts', 'map', or 'groups'.") + + if mode == 'map': + if len(sys.argv) != 4: + abort('USAGE: python mapjson.py map ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Map file "%s" does not exist' % (filepath)) + + layouts_filepath = sys.argv[3] + if not os.path.exists(layouts_filepath): + abort('ERROR: Layouts file "%s" does not exist' % (layouts_filepath)) + + process_map(filepath, layouts_filepath) + elif mode == 'groups': + if len(sys.argv) != 3: + abort('USAGE: python mapjson.py groups ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Map file "%s" does not exist' % (filepath)) + + process_groups(filepath) + elif mode == 'layouts': + if len(sys.argv) != 3: + abort('USAGE: python mapjson.py layouts ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Layouts file "%s" does not exist' % (filepath)) + + process_layouts(filepath) + + +if __name__ == '__main__': + main() From 7750a8126ded530e3088b6229cd742797b1e7c37 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 00:25:31 +0100 Subject: [PATCH 23/42] CgbSound is decompiled. --- Makefile | 1 + asm/m4a_3.s | 574 ------------------------------------- include/gba/m4a_internal.h | 65 ++--- ld_script.txt | 2 +- src/m4a_3.c | 324 +++++++++++++++++++++ 5 files changed, 359 insertions(+), 607 deletions(-) delete mode 100644 asm/m4a_3.s create mode 100644 src/m4a_3.c diff --git a/Makefile b/Makefile index 32cc9df73e..4b13d59dbd 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,7 @@ $(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork $(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc +$(C_BUILDDIR)/m4a_3.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding diff --git a/asm/m4a_3.s b/asm/m4a_3.s deleted file mode 100644 index a842ae925a..0000000000 --- a/asm/m4a_3.s +++ /dev/null @@ -1,574 +0,0 @@ - .include "asm/macros.inc" - .include "constants/gba_constants.inc" - .include "constants/m4a_constants.inc" - - .syntax unified - - .text - - thumb_func_start CgbSound -CgbSound: @ 81DEA70 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - ldr r0, =SOUND_INFO_PTR - ldr r0, [r0] - str r0, [sp, 0x4] - ldrb r0, [r0, 0xA] - cmp r0, 0 - beq _081DEA94 - subs r0, 0x1 - ldr r1, [sp, 0x4] - strb r0, [r1, 0xA] - b _081DEA9A - .pool -_081DEA94: - movs r0, 0xE - ldr r2, [sp, 0x4] - strb r0, [r2, 0xA] -_081DEA9A: - movs r6, 0x1 - ldr r0, [sp, 0x4] - ldr r4, [r0, 0x1C] -_081DEAA0: - ldrb r1, [r4] - movs r0, 0xC7 - ands r0, r1 - adds r2, r6, 0x1 - mov r10, r2 - movs r2, 0x40 - adds r2, r4 - mov r9, r2 - cmp r0, 0 - bne _081DEAB6 - b _081DEEA0 -_081DEAB6: - cmp r6, 0x2 - beq _081DEAE8 - cmp r6, 0x2 - bgt _081DEAC4 - cmp r6, 0x1 - beq _081DEACA - b _081DEB20 -_081DEAC4: - cmp r6, 0x3 - beq _081DEB00 - b _081DEB20 -_081DEACA: - ldr r0, =REG_NR10 - str r0, [sp, 0x8] - ldr r7, =REG_NR11 - ldr r2, =REG_NR12 - str r2, [sp, 0xC] - adds r0, 0x4 - str r0, [sp, 0x10] - adds r2, 0x2 - b _081DEB30 - .pool -_081DEAE8: - ldr r0, =REG_NR10 + 1 - str r0, [sp, 0x8] - ldr r7, =REG_NR21 - ldr r2, =REG_NR22 - b _081DEB28 - .pool -_081DEB00: - ldr r0, =REG_NR30 - str r0, [sp, 0x8] - ldr r7, =REG_NR31 - ldr r2, =REG_NR32 - str r2, [sp, 0xC] - adds r0, 0x4 - str r0, [sp, 0x10] - adds r2, 0x2 - b _081DEB30 - .pool -_081DEB20: - ldr r0, =REG_NR30 + 1 - str r0, [sp, 0x8] - ldr r7, =REG_NR41 - ldr r2, =REG_NR42 -_081DEB28: - str r2, [sp, 0xC] - adds r0, 0xB - str r0, [sp, 0x10] - adds r2, 0x4 -_081DEB30: - str r2, [sp, 0x14] - ldr r0, [sp, 0x4] - ldrb r0, [r0, 0xA] - str r0, [sp] - ldr r2, [sp, 0xC] - ldrb r0, [r2] - mov r8, r0 - adds r2, r1, 0 - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - beq _081DEC26 - movs r3, 0x40 - adds r0, r3, 0 - ands r0, r2 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r6, 0x1 - mov r10, r0 - movs r1, 0x40 - adds r1, r4 - mov r9, r1 - cmp r5, 0 - bne _081DEC4A - movs r0, 0x3 - strb r0, [r4] - strb r0, [r4, 0x1D] - adds r0, r4, 0 - str r3, [sp, 0x18] - bl CgbModVol - ldr r3, [sp, 0x18] - cmp r6, 0x2 - beq _081DEB98 - cmp r6, 0x2 - bgt _081DEB8C - cmp r6, 0x1 - beq _081DEB92 - b _081DEBEC - .pool -_081DEB8C: - cmp r6, 0x3 - beq _081DEBA4 - b _081DEBEC -_081DEB92: - ldrb r0, [r4, 0x1F] - ldr r2, [sp, 0x8] - strb r0, [r2] -_081DEB98: - ldr r0, [r4, 0x24] - lsls r0, 6 - ldrb r1, [r4, 0x1E] - adds r0, r1, r0 - strb r0, [r7] - b _081DEBF8 -_081DEBA4: - ldr r1, [r4, 0x24] - ldr r0, [r4, 0x28] - cmp r1, r0 - beq _081DEBCC - ldr r2, [sp, 0x8] - strb r3, [r2] - ldr r1, =REG_WAVE_RAM - ldr r2, [r4, 0x24] - ldr r0, [r2] - str r0, [r1] - adds r1, 0x4 - ldr r0, [r2, 0x4] - str r0, [r1] - adds r1, 0x4 - ldr r0, [r2, 0x8] - str r0, [r1] - adds r1, 0x4 - ldr r0, [r2, 0xC] - str r0, [r1] - str r2, [r4, 0x28] -_081DEBCC: - ldr r0, [sp, 0x8] - strb r5, [r0] - ldrb r0, [r4, 0x1E] - strb r0, [r7] - ldrb r0, [r4, 0x1E] - cmp r0, 0 - beq _081DEBE4 - movs r0, 0xC0 - b _081DEC06 - .pool -_081DEBE4: - movs r1, 0x80 - negs r1, r1 - strb r1, [r4, 0x1A] - b _081DEC08 -_081DEBEC: - ldrb r0, [r4, 0x1E] - strb r0, [r7] - ldr r0, [r4, 0x24] - lsls r0, 3 - ldr r2, [sp, 0x10] - strb r0, [r2] -_081DEBF8: - ldrb r0, [r4, 0x4] - adds r0, 0x8 - mov r8, r0 - ldrb r0, [r4, 0x1E] - cmp r0, 0 - beq _081DEC06 - movs r0, 0x40 -_081DEC06: - strb r0, [r4, 0x1A] -_081DEC08: - ldrb r1, [r4, 0x4] - movs r2, 0 - strb r1, [r4, 0xB] - movs r0, 0xFF - ands r0, r1 - adds r1, r6, 0x1 - mov r10, r1 - movs r1, 0x40 - adds r1, r4 - mov r9, r1 - cmp r0, 0 - bne _081DEC22 - b _081DED5E -_081DEC22: - strb r2, [r4, 0x9] - b _081DED8C -_081DEC26: - movs r0, 0x4 - ands r0, r2 - cmp r0, 0 - beq _081DEC58 - ldrb r0, [r4, 0xD] - subs r0, 0x1 - strb r0, [r4, 0xD] - movs r2, 0xFF - ands r0, r2 - lsls r0, 24 - adds r1, r6, 0x1 - mov r10, r1 - movs r2, 0x40 - adds r2, r4 - mov r9, r2 - cmp r0, 0 - ble _081DEC4A - b _081DED9E -_081DEC4A: - lsls r0, r6, 24 - lsrs r0, 24 - bl CgbOscOff - movs r0, 0 - strb r0, [r4] - b _081DEE9C -_081DEC58: - movs r0, 0x40 - ands r0, r1 - adds r2, r6, 0x1 - mov r10, r2 - movs r2, 0x40 - adds r2, r4 - mov r9, r2 - cmp r0, 0 - beq _081DEC98 - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _081DEC98 - movs r0, 0xFC - ands r0, r1 - movs r2, 0 - strb r0, [r4] - ldrb r1, [r4, 0x7] - strb r1, [r4, 0xB] - movs r0, 0xFF - ands r0, r1 - cmp r0, 0 - beq _081DECCA - movs r0, 0x1 - ldrb r1, [r4, 0x1D] - orrs r0, r1 - strb r0, [r4, 0x1D] - cmp r6, 0x3 - beq _081DED8C - ldrb r2, [r4, 0x7] - mov r8, r2 - b _081DED8C -_081DEC98: - ldrb r0, [r4, 0xB] - cmp r0, 0 - bne _081DED8C - cmp r6, 0x3 - bne _081DECAA - movs r0, 0x1 - ldrb r1, [r4, 0x1D] - orrs r0, r1 - strb r0, [r4, 0x1D] -_081DECAA: - adds r0, r4, 0 - bl CgbModVol - movs r0, 0x3 - ldrb r2, [r4] - ands r0, r2 - cmp r0, 0 - bne _081DECFE - ldrb r0, [r4, 0x9] - subs r0, 0x1 - strb r0, [r4, 0x9] - movs r1, 0xFF - ands r0, r1 - lsls r0, 24 - cmp r0, 0 - bgt _081DECFA -_081DECCA: - ldrb r2, [r4, 0xC] - ldrb r1, [r4, 0xA] - adds r0, r2, 0 - muls r0, r1 - adds r0, 0xFF - asrs r0, 8 - movs r1, 0 - strb r0, [r4, 0x9] - lsls r0, 24 - cmp r0, 0 - beq _081DEC4A - movs r0, 0x4 - ldrb r2, [r4] - orrs r0, r2 - strb r0, [r4] - movs r0, 0x1 - ldrb r1, [r4, 0x1D] - orrs r0, r1 - strb r0, [r4, 0x1D] - cmp r6, 0x3 - beq _081DED9E - movs r2, 0x8 - mov r8, r2 - b _081DED9E -_081DECFA: - ldrb r0, [r4, 0x7] - b _081DED8A -_081DECFE: - cmp r0, 0x1 - bne _081DED0A -_081DED02: - ldrb r0, [r4, 0x19] - strb r0, [r4, 0x9] - movs r0, 0x7 - b _081DED8A -_081DED0A: - cmp r0, 0x2 - bne _081DED4E - ldrb r0, [r4, 0x9] - subs r0, 0x1 - strb r0, [r4, 0x9] - movs r1, 0xFF - ands r0, r1 - lsls r0, 24 - ldrb r2, [r4, 0x19] - lsls r1, r2, 24 - cmp r0, r1 - bgt _081DED4A -_081DED22: - ldrb r0, [r4, 0x6] - cmp r0, 0 - bne _081DED32 - movs r0, 0xFC - ldrb r1, [r4] - ands r0, r1 - strb r0, [r4] - b _081DECCA -_081DED32: - ldrb r0, [r4] - subs r0, 0x1 - strb r0, [r4] - movs r0, 0x1 - ldrb r2, [r4, 0x1D] - orrs r0, r2 - strb r0, [r4, 0x1D] - cmp r6, 0x3 - beq _081DED02 - movs r0, 0x8 - mov r8, r0 - b _081DED02 -_081DED4A: - ldrb r0, [r4, 0x5] - b _081DED8A -_081DED4E: - ldrb r0, [r4, 0x9] - adds r0, 0x1 - strb r0, [r4, 0x9] - movs r1, 0xFF - ands r0, r1 - ldrb r2, [r4, 0xA] - cmp r0, r2 - bcc _081DED88 -_081DED5E: - ldrb r0, [r4] - subs r0, 0x1 - movs r2, 0 - strb r0, [r4] - ldrb r1, [r4, 0x5] - strb r1, [r4, 0xB] - movs r0, 0xFF - ands r0, r1 - cmp r0, 0 - beq _081DED22 - movs r0, 0x1 - ldrb r1, [r4, 0x1D] - orrs r0, r1 - strb r0, [r4, 0x1D] - ldrb r0, [r4, 0xA] - strb r0, [r4, 0x9] - cmp r6, 0x3 - beq _081DED8C - ldrb r2, [r4, 0x5] - mov r8, r2 - b _081DED8C -_081DED88: - ldrb r0, [r4, 0x4] -_081DED8A: - strb r0, [r4, 0xB] -_081DED8C: - ldrb r0, [r4, 0xB] - subs r0, 0x1 - strb r0, [r4, 0xB] - ldr r0, [sp] - cmp r0, 0 - bne _081DED9E - subs r0, 0x1 - str r0, [sp] - b _081DEC98 -_081DED9E: - movs r0, 0x2 - ldrb r1, [r4, 0x1D] - ands r0, r1 - cmp r0, 0 - beq _081DEE16 - cmp r6, 0x3 - bgt _081DEDDE - movs r0, 0x8 - ldrb r2, [r4, 0x1] - ands r0, r2 - cmp r0, 0 - beq _081DEDDE - ldr r0, =REG_SOUNDBIAS + 1 - ldrb r0, [r0] - cmp r0, 0x3F - bgt _081DEDD0 - ldr r0, [r4, 0x20] - adds r0, 0x2 - ldr r1, =0x000007fc - b _081DEDDA - .pool -_081DEDD0: - cmp r0, 0x7F - bgt _081DEDDE - ldr r0, [r4, 0x20] - adds r0, 0x1 - ldr r1, =0x000007fe -_081DEDDA: - ands r0, r1 - str r0, [r4, 0x20] -_081DEDDE: - cmp r6, 0x4 - beq _081DEDF0 - ldr r0, [r4, 0x20] - ldr r1, [sp, 0x10] - strb r0, [r1] - b _081DEDFE - .pool -_081DEDF0: - ldr r2, [sp, 0x10] - ldrb r0, [r2] - movs r1, 0x8 - ands r1, r0 - ldr r0, [r4, 0x20] - orrs r0, r1 - strb r0, [r2] -_081DEDFE: - movs r0, 0xC0 - ldrb r1, [r4, 0x1A] - ands r0, r1 - adds r1, r4, 0 - adds r1, 0x21 - ldrb r1, [r1] - adds r0, r1, r0 - strb r0, [r4, 0x1A] - movs r2, 0xFF - ands r0, r2 - ldr r1, [sp, 0x14] - strb r0, [r1] -_081DEE16: - movs r0, 0x1 - ldrb r2, [r4, 0x1D] - ands r0, r2 - cmp r0, 0 - beq _081DEE9C - ldr r1, =REG_NR51 - ldrb r0, [r1] - ldrb r2, [r4, 0x1C] - bics r0, r2 - ldrb r2, [r4, 0x1B] - orrs r0, r2 - strb r0, [r1] - cmp r6, 0x3 - bne _081DEE68 - ldr r0, =gCgb3Vol - ldrb r1, [r4, 0x9] - adds r0, r1, r0 - ldrb r0, [r0] - ldr r2, [sp, 0xC] - strb r0, [r2] - movs r1, 0x80 - adds r0, r1, 0 - ldrb r2, [r4, 0x1A] - ands r0, r2 - cmp r0, 0 - beq _081DEE9C - ldr r0, [sp, 0x8] - strb r1, [r0] - ldrb r0, [r4, 0x1A] - ldr r1, [sp, 0x14] - strb r0, [r1] - movs r0, 0x7F - ldrb r2, [r4, 0x1A] - ands r0, r2 - strb r0, [r4, 0x1A] - b _081DEE9C - .pool -_081DEE68: - movs r0, 0xF - mov r1, r8 - ands r1, r0 - mov r8, r1 - ldrb r2, [r4, 0x9] - lsls r0, r2, 4 - add r0, r8 - ldr r1, [sp, 0xC] - strb r0, [r1] - movs r2, 0x80 - ldrb r0, [r4, 0x1A] - orrs r0, r2 - ldr r1, [sp, 0x14] - strb r0, [r1] - cmp r6, 0x1 - bne _081DEE9C - ldr r0, [sp, 0x8] - ldrb r1, [r0] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - bne _081DEE9C - ldrb r0, [r4, 0x1A] - orrs r0, r2 - ldr r1, [sp, 0x14] - strb r0, [r1] -_081DEE9C: - movs r0, 0 - strb r0, [r4, 0x1D] -_081DEEA0: - mov r6, r10 - mov r4, r9 - cmp r6, 0x4 - bgt _081DEEAA - b _081DEAA0 -_081DEEAA: - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end CgbSound - - .align 2, 0 @ Don't pad with nop. diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index 339a0774ed..e2836c6f6b 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -69,38 +69,38 @@ struct ToneData struct CgbChannel { - u8 sf; - u8 ty; - u8 rightVolume; - u8 leftVolume; - u8 at; - u8 de; - u8 su; - u8 re; - u8 ky; - u8 ev; - u8 eg; - u8 ec; - u8 echoVolume; - u8 echoLength; - u8 d1; - u8 d2; - u8 gt; - u8 mk; - u8 ve; - u8 pr; - u8 rp; - u8 d3[3]; - u8 d5; - u8 sg; - u8 n4; - u8 pan; - u8 panMask; - u8 mo; - u8 le; - u8 sw; - u32 fr; - u32 wp; + u8 sf; // 0x0 + u8 ty; // 0x1 + u8 rightVolume; // 0x2 + u8 leftVolume; // 0x3 + u8 at; // 0x4 + u8 de; // 0x5 + u8 su; // 0x6 + u8 re; // 0x7 + u8 ky; // 0x8 + u8 ev; // 0x9 + u8 eg; // 0xA + u8 ec; // 0xB + u8 echoVolume; // 0xC + u8 echoLength; // 0xD + u8 d1; // 0xE + u8 d2; // 0xF + u8 gt; // 0x10 + u8 mk; // 0x11 + u8 ve; // 0x12 + u8 pr; // 0x13 + u8 rp; // 0x14 + u8 d3[3]; // 0x15, 0x16, 0x17 + u8 d5; // 0x18 + u8 sg; // 0x19 + u8 n4; // 0x1A + u8 pan; // 0x1B + u8 panMask; // 0x1C + u8 mo; // 0x1D + u8 le; // 0x1E + u8 sw; // 0x1F + u32 fr; // 0x20 + u32 *wp; u32 cp; u32 tp; u32 pp; @@ -397,6 +397,7 @@ void m4aSoundMode(u32 mode); void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track, u8 a3); void CgbSound(void); void CgbOscOff(u8); +void CgbModVol(struct CgbChannel *chan); u32 MidiKeyToCgbFreq(u8, u8, u8); void DummyFunc(void); void MPlayJumpTableCopy(void **mplayJumpTable); diff --git a/ld_script.txt b/ld_script.txt index caac5c0bd9..d1219cb3ed 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -320,7 +320,7 @@ SECTIONS { asm/libgcnmultiboot.o(.text); asm/m4a_1.o(.text); src/m4a_2.o(.text); - asm/m4a_3.o(.text); + src/m4a_3.o(.text); src/m4a_4.o(.text); src/agb_flash.o(.text); src/agb_flash_1m.o(.text); diff --git a/src/m4a_3.c b/src/m4a_3.c new file mode 100644 index 0000000000..77d0087c02 --- /dev/null +++ b/src/m4a_3.c @@ -0,0 +1,324 @@ +#include "gba/m4a_internal.h" + +extern const u8 gCgb3Vol[]; + +void CgbSound(void) +{ + s32 ch; + struct CgbChannel *channels; + s32 evAdd; + s32 prevC15; + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + vu8 *nrx0ptr; + vu8 *nrx1ptr; + vu8 *nrx2ptr; + vu8 *nrx3ptr; + vu8 *nrx4ptr; + + // Most comparision operations that cast to s8 perform 'and' by 0xFF. + int xFF = 0xff; + + if (soundInfo->c15) + soundInfo->c15--; + else + soundInfo->c15 = 14; + + for (ch = 1, channels = soundInfo->cgbChans; ch <= 4; ch++, channels++) + { + if (!(channels->sf & 0xc7)) + continue; + + switch (ch) + { + case 1: + nrx0ptr = (vu8 *)(REG_ADDR_NR10); + nrx1ptr = (vu8 *)(REG_ADDR_NR11); + nrx2ptr = (vu8 *)(REG_ADDR_NR12); + nrx3ptr = (vu8 *)(REG_ADDR_NR13); + nrx4ptr = (vu8 *)(REG_ADDR_NR14); + break; + case 2: + nrx0ptr = (vu8 *)(REG_ADDR_NR10+1); + nrx1ptr = (vu8 *)(REG_ADDR_NR21); + nrx2ptr = (vu8 *)(REG_ADDR_NR22); + nrx3ptr = (vu8 *)(REG_ADDR_NR23); + nrx4ptr = (vu8 *)(REG_ADDR_NR24); + break; + case 3: + nrx0ptr = (vu8 *)(REG_ADDR_NR30); + nrx1ptr = (vu8 *)(REG_ADDR_NR31); + nrx2ptr = (vu8 *)(REG_ADDR_NR32); + nrx3ptr = (vu8 *)(REG_ADDR_NR33); + nrx4ptr = (vu8 *)(REG_ADDR_NR34); + break; + default: + nrx0ptr = (vu8 *)(REG_ADDR_NR30+1); + nrx1ptr = (vu8 *)(REG_ADDR_NR41); + nrx2ptr = (vu8 *)(REG_ADDR_NR42); + nrx3ptr = (vu8 *)(REG_ADDR_NR43); + nrx4ptr = (vu8 *)(REG_ADDR_NR44); + break; + } + + prevC15 = soundInfo->c15; + evAdd = *nrx2ptr; + + if (channels->sf & 0x80) + { + if (!(channels->sf & 0x40)) + { + channels->sf = 3; + channels->mo = 3; + CgbModVol(channels); + switch (ch) + { + case 1: + *nrx0ptr = channels->sw; + // fallthrough + case 2: + *nrx1ptr = ((u32)channels->wp << 6) + channels->le; + goto loc_82E0E30; + break; + case 3: + if ((u32)channels->wp != channels->cp) + { + *nrx0ptr = 0x40; + REG_WAVE_RAM0 = channels->wp[0]; + REG_WAVE_RAM1 = channels->wp[1]; + REG_WAVE_RAM2 = channels->wp[2]; + REG_WAVE_RAM3 = channels->wp[3]; + channels->cp = (u32)channels->wp; + } + *nrx0ptr = 0; + *nrx1ptr = channels->le; + if (channels->le) + channels->n4 = -64; + else + channels->n4 = -128; + break; + default: + *nrx1ptr = channels->le; + *nrx3ptr = (u32)channels->wp << 3; + loc_82E0E30: + evAdd = channels->at + 8; + if (channels->le) + channels->n4 = 64; + else + channels->n4 = 0; + break; + } + channels->ec = channels->at; + if ((s8)(channels->at & xFF)) + { + channels->ev = 0; + goto EC_MINUS; + } + else + { + goto loc_82E0F96; + } + } + else + { + goto loc_82E0E82; + } + } + else if (channels->sf & 0x04) + { + channels->echoLength--; + if ((s8)(channels->echoLength & xFF) <= 0) + { + loc_82E0E82: + CgbOscOff(ch); + channels->sf = 0; + goto LAST_LABEL; + } + goto loc_82E0FD6; + } + else if ((channels->sf & 0x40) && (channels->sf & 0x03)) + { + channels->sf &= 0xfc; + channels->ec = channels->re; + if ((s8)(channels->re & xFF)) + { + channels->mo |= 1; + if (ch != 3) + { + evAdd = channels->re; + } + goto EC_MINUS; + } + else + { + goto loc_82E0F02; + } + } + else + { + loc_82E0ED0: + if (channels->ec == 0) + { + if (ch == 3) + { + channels->mo |= 1; + } + CgbModVol(channels); + if ((channels->sf & 0x3) == 0) + { + channels->ev--; + if ((s8)(channels->ev & xFF) <= 0) + { + loc_82E0F02: + channels->ev = ((channels->eg * channels->echoVolume) + 0xFF) >> 8; + if (channels->ev) + { + channels->sf |= 0x4; + channels->mo |= 1; + if (ch != 3) + { + evAdd = 8; + } + goto loc_82E0FD6; + } + else + { + goto loc_82E0E82; + } + } + else + { + channels->ec = channels->re; + } + } + else if ((channels->sf & 0x3) == 1) + { + loc_82E0F3A: + channels->ev = channels->sg; + channels->ec = 7; + } + else if ((channels->sf & 0x3) == 2) + { + int ev, sg; + + channels->ev--; + ev = (s8)(channels->ev & xFF); + sg = (s8)(channels->sg); + if (ev <= sg) + { + loc_82E0F5A: + if (channels->su == 0) + { + channels->sf &= 0xfc; + goto loc_82E0F02; + } + else + { + channels->sf--; + channels->mo |= 1; + if (ch != 3) + { + evAdd = 8; + } + goto loc_82E0F3A; + } + } + else + { + channels->ec = channels->de; + } + } + else + { + channels->ev++; + if ((u8)(channels->ev & xFF) >= channels->eg) + { + loc_82E0F96: + channels->sf--; + channels->ec = channels->de; + if ((u8)(channels->ec & xFF)) + { + channels->mo |= 1; + channels->ev = channels->eg; + if (ch != 3) + { + evAdd = channels->de; + } + } + else + { + goto loc_82E0F5A; + } + } + else + { + channels->ec = channels->at; + } + } + } + } + + EC_MINUS: + channels->ec--; + if (prevC15 == 0) + { + prevC15--; + goto loc_82E0ED0; + } + + loc_82E0FD6: + if (channels->mo & 0x2) + { + if (ch < 4 && (channels->ty & 0x08)) + { + int biasH = REG_SOUNDBIAS_H; + + if (biasH < 64) + { + channels->fr = (channels->fr + 2) & 0x7fc; + } + else if (biasH < 128) + { + channels->fr = (channels->fr + 1) & 0x7fe; + } + } + if (ch != 4) + { + *nrx3ptr = channels->fr; + } + else + { + *nrx3ptr = (*nrx3ptr & 0x08) | channels->fr; + } + channels->n4 = (channels->n4 & 0xC0) + (*((u8*)(&channels->fr) + 1)); + *nrx4ptr = (s8)(channels->n4 & xFF); + } + + if (channels->mo & 1) + { + REG_NR51 = (REG_NR51 & ~channels->panMask) | channels->pan; + if (ch == 3) + { + *nrx2ptr = gCgb3Vol[channels->ev]; + if (channels->n4 & 0x80) + { + *nrx0ptr = 0x80; + *nrx4ptr = channels->n4; + channels->n4 &= 0x7f; + } + } + else + { + evAdd &= 0xf; + *nrx2ptr = (channels->ev << 4) + evAdd; + *nrx4ptr = channels->n4 | 0x80; + if (ch == 1 && !(*nrx0ptr & 0x08)) + { + *nrx4ptr = channels->n4 | 0x80; + } + } + } + + LAST_LABEL: + channels->mo = 0; + } +} From b4055e4fc034f1830161a54b970ec19556f48245 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 10:37:13 +0100 Subject: [PATCH 24/42] Merge m4a files into one, get rid of one asm --- Makefile | 6 +- common_syms/{m4a_2.txt => m4a.txt} | 0 ld_script.txt | 6 +- src/m4a.c | 1779 ++++++++++++++++++++++++++++ src/m4a_2.c | 912 -------------- src/m4a_3.c | 324 ----- src/m4a_4.c | 545 --------- sym_common.txt | 2 +- 8 files changed, 1784 insertions(+), 1790 deletions(-) rename common_syms/{m4a_2.txt => m4a.txt} (100%) create mode 100644 src/m4a.c delete mode 100644 src/m4a_2.c delete mode 100644 src/m4a_3.c delete mode 100644 src/m4a_4.c diff --git a/Makefile b/Makefile index 4b13d59dbd..6851c8c907 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR) ASFLAGS := -mcpu=arm7tdmi CC1 := tools/agbcc/bin/agbcc$(EXE) -override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -Os -fhex-asm CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include @@ -130,9 +130,7 @@ $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork $(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork -$(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc -$(C_BUILDDIR)/m4a_3.o: CC1 := tools/agbcc/bin/old_agbcc -$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc +$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding diff --git a/common_syms/m4a_2.txt b/common_syms/m4a.txt similarity index 100% rename from common_syms/m4a_2.txt rename to common_syms/m4a.txt diff --git a/ld_script.txt b/ld_script.txt index d1219cb3ed..bf8d4bde94 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -27,7 +27,7 @@ SECTIONS { INCLUDE "sym_bss.ld" /* .bss.code starts at 0x3001AA8 */ - src/m4a_2.o(.bss.code); + src/m4a.o(.bss.code); /* COMMON starts at 0x30022A8 */ INCLUDE "sym_common.ld" @@ -319,9 +319,7 @@ SECTIONS { { asm/libgcnmultiboot.o(.text); asm/m4a_1.o(.text); - src/m4a_2.o(.text); - src/m4a_3.o(.text); - src/m4a_4.o(.text); + src/m4a.o(.text); src/agb_flash.o(.text); src/agb_flash_1m.o(.text); src/agb_flash_mx.o(.text); diff --git a/src/m4a.c b/src/m4a.c new file mode 100644 index 0000000000..7b4441ca42 --- /dev/null +++ b/src/m4a.c @@ -0,0 +1,1779 @@ +#include "gba/m4a_internal.h" + +extern const u8 gCgb3Vol[]; + +#define BSS_CODE __attribute__((section(".bss.code"))) + +BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0}; + +struct SoundInfo gSoundInfo; +struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES]; +struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES]; +void *gMPlayJumpTable[36]; +struct CgbChannel gCgbChans[4]; +struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2]; +struct PokemonCrySong gPokemonCrySong; +struct MusicPlayerInfo gMPlayInfo_BGM; +struct MusicPlayerInfo gMPlayInfo_SE1; +struct MusicPlayerInfo gMPlayInfo_SE2; +struct MusicPlayerInfo gMPlayInfo_SE3; +u8 gMPlayMemAccArea[0x10]; + +u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) +{ + u32 val1; + u32 val2; + u32 fineAdjustShifted = fineAdjust << 24; + + if (key > 178) + { + key = 178; + fineAdjustShifted = 255 << 24; + } + + val1 = gScaleTable[key]; + val1 = gFreqTable[val1 & 0xF] >> (val1 >> 4); + + val2 = gScaleTable[key + 1]; + val2 = gFreqTable[val2 & 0xF] >> (val2 >> 4); + + return umul3232H32(wav->freq, val1 + umul3232H32(val2 - val1, fineAdjustShifted)); +} + +void UnusedDummyFunc(void) +{ +} + +void MPlayContinue(struct MusicPlayerInfo *mplayInfo) +{ + if (mplayInfo->ident == ID_NUMBER) + { + mplayInfo->ident++; + mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE; + mplayInfo->ident = ID_NUMBER; + } +} + +void MPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed) +{ + if (mplayInfo->ident == ID_NUMBER) + { + mplayInfo->ident++; + mplayInfo->fadeOC = speed; + mplayInfo->fadeOI = speed; + mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT); + mplayInfo->ident = ID_NUMBER; + } +} + +void m4aSoundInit(void) +{ + s32 i; + + CpuCopy32((void *)((s32)SoundMainRAM & ~1), SoundMainRAM_Buffer, sizeof(SoundMainRAM_Buffer)); + + SoundInit(&gSoundInfo); + MPlayExtender(gCgbChans); + m4aSoundMode(SOUND_MODE_DA_BIT_8 + | SOUND_MODE_FREQ_13379 + | (12 << SOUND_MODE_MASVOL_SHIFT) + | (5 << SOUND_MODE_MAXCHN_SHIFT)); + + for (i = 0; i < NUM_MUSIC_PLAYERS; i++) + { + struct MusicPlayerInfo *mplayInfo = gMPlayTable[i].info; + MPlayOpen(mplayInfo, gMPlayTable[i].track, gMPlayTable[i].unk_8); + mplayInfo->unk_B = gMPlayTable[i].unk_A; + mplayInfo->memAccArea = gMPlayMemAccArea; + } + + memcpy(&gPokemonCrySong, &gPokemonCrySongTemplate, sizeof(struct PokemonCrySong)); + + for (i = 0; i < MAX_POKEMON_CRIES; i++) + { + struct MusicPlayerInfo *mplayInfo = &gPokemonCryMusicPlayers[i]; + struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2]; + MPlayOpen(mplayInfo, track, 2); + track->chan = 0; + } +} + +void m4aSoundMain(void) +{ + SoundMain(); +} + +void m4aSongNumStart(u16 n) +{ + const struct MusicPlayer *mplayTable = gMPlayTable; + const struct Song *songTable = gSongTable; + const struct Song *song = &songTable[n]; + const struct MusicPlayer *mplay = &mplayTable[song->ms]; + + MPlayStart(mplay->info, song->header); +} + +void m4aSongNumStartOrChange(u16 n) +{ + const struct MusicPlayer *mplayTable = gMPlayTable; + const struct Song *songTable = gSongTable; + const struct Song *song = &songTable[n]; + const struct MusicPlayer *mplay = &mplayTable[song->ms]; + + if (mplay->info->songHeader != song->header) + { + MPlayStart(mplay->info, song->header); + } + else + { + if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0 + || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)) + { + MPlayStart(mplay->info, song->header); + } + } +} + +void m4aSongNumStartOrContinue(u16 n) +{ + const struct MusicPlayer *mplayTable = gMPlayTable; + const struct Song *songTable = gSongTable; + const struct Song *song = &songTable[n]; + const struct MusicPlayer *mplay = &mplayTable[song->ms]; + + if (mplay->info->songHeader != song->header) + MPlayStart(mplay->info, song->header); + else if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0) + MPlayStart(mplay->info, song->header); + else if (mplay->info->status & MUSICPLAYER_STATUS_PAUSE) + MPlayContinue(mplay->info); +} + +void m4aSongNumStop(u16 n) +{ + const struct MusicPlayer *mplayTable = gMPlayTable; + const struct Song *songTable = gSongTable; + const struct Song *song = &songTable[n]; + const struct MusicPlayer *mplay = &mplayTable[song->ms]; + + if (mplay->info->songHeader == song->header) + m4aMPlayStop(mplay->info); +} + +void m4aSongNumContinue(u16 n) +{ + const struct MusicPlayer *mplayTable = gMPlayTable; + const struct Song *songTable = gSongTable; + const struct Song *song = &songTable[n]; + const struct MusicPlayer *mplay = &mplayTable[song->ms]; + + if (mplay->info->songHeader == song->header) + MPlayContinue(mplay->info); +} + +void m4aMPlayAllStop(void) +{ + s32 i; + + for (i = 0; i < NUM_MUSIC_PLAYERS; i++) + m4aMPlayStop(gMPlayTable[i].info); + + for (i = 0; i < MAX_POKEMON_CRIES; i++) + m4aMPlayStop(&gPokemonCryMusicPlayers[i]); +} + +void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo) +{ + MPlayContinue(mplayInfo); +} + +void m4aMPlayAllContinue(void) +{ + s32 i; + + for (i = 0; i < NUM_MUSIC_PLAYERS; i++) + MPlayContinue(gMPlayTable[i].info); + + for (i = 0; i < MAX_POKEMON_CRIES; i++) + MPlayContinue(&gPokemonCryMusicPlayers[i]); +} + +void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed) +{ + MPlayFadeOut(mplayInfo, speed); +} + +void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed) +{ + if (mplayInfo->ident == ID_NUMBER) + { + mplayInfo->ident++; + mplayInfo->fadeOC = speed; + mplayInfo->fadeOI = speed; + mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT) | TEMPORARY_FADE; + mplayInfo->ident = ID_NUMBER; + } +} + +void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed) +{ + if (mplayInfo->ident == ID_NUMBER) + { + mplayInfo->ident++; + mplayInfo->fadeOC = speed; + mplayInfo->fadeOI = speed; + mplayInfo->fadeOV = (0 << FADE_VOL_SHIFT) | FADE_IN; + mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE; + mplayInfo->ident = ID_NUMBER; + } +} + +void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo) +{ + s32 trackCount = mplayInfo->trackCount; + struct MusicPlayerTrack *track = mplayInfo->tracks; + + while (trackCount > 0) + { + if (track->flags & MPT_FLG_EXIST) + { + if (track->flags & MPT_FLG_START) + { + Clear64byte(track); + track->flags = MPT_FLG_EXIST; + track->bendRange = 2; + track->volX = 64; + track->lfoSpeed = 22; + track->tone.type = 1; + } + } + + trackCount--; + track++; + } +} + +void MPlayExtender(struct CgbChannel *cgbChans) +{ + struct SoundInfo *soundInfo; + u32 ident; + + REG_SOUNDCNT_X = SOUND_MASTER_ENABLE + | SOUND_4_ON + | SOUND_3_ON + | SOUND_2_ON + | SOUND_1_ON; + REG_SOUNDCNT_L = 0; // set master volume to zero + REG_NR12 = 0x8; + REG_NR22 = 0x8; + REG_NR42 = 0x8; + REG_NR14 = 0x80; + REG_NR24 = 0x80; + REG_NR44 = 0x80; + REG_NR30 = 0; + REG_NR50 = 0x77; + + soundInfo = SOUND_INFO_PTR; + + ident = soundInfo->ident; + + if (ident != ID_NUMBER) + return; + + soundInfo->ident++; + + gMPlayJumpTable[8] = ply_memacc; + gMPlayJumpTable[17] = ply_lfos; + gMPlayJumpTable[19] = ply_mod; + gMPlayJumpTable[28] = ply_xcmd; + gMPlayJumpTable[29] = ply_endtie; + gMPlayJumpTable[30] = SampleFreqSet; + gMPlayJumpTable[31] = TrackStop; + gMPlayJumpTable[32] = FadeOutBody; + gMPlayJumpTable[33] = TrkVolPitSet; + + soundInfo->cgbChans = (struct CgbChannel *)cgbChans; + soundInfo->CgbSound = CgbSound; + soundInfo->CgbOscOff = CgbOscOff; + soundInfo->MidiKeyToCgbFreq = MidiKeyToCgbFreq; + soundInfo->maxLines = MAX_LINES; + + CpuFill32(0, cgbChans, sizeof(struct CgbChannel) * 4); + + cgbChans[0].ty = 1; + cgbChans[0].panMask = 0x11; + cgbChans[1].ty = 2; + cgbChans[1].panMask = 0x22; + cgbChans[2].ty = 3; + cgbChans[2].panMask = 0x44; + cgbChans[3].ty = 4; + cgbChans[3].panMask = 0x88; + + soundInfo->ident = ident; +} + +void MusicPlayerJumpTableCopy(void) +{ + asm("swi 0x2A"); +} + +void ClearChain(void *x) +{ + void (*func)(void *) = *(&gMPlayJumpTable[34]); + func(x); +} + +void Clear64byte(void *x) +{ + void (*func)(void *) = *(&gMPlayJumpTable[35]); + func(x); +} + +void SoundInit(struct SoundInfo *soundInfo) +{ + soundInfo->ident = 0; + + if (REG_DMA1CNT & (DMA_REPEAT << 16)) + REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + + if (REG_DMA2CNT & (DMA_REPEAT << 16)) + REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + + REG_DMA1CNT_H = DMA_32BIT; + REG_DMA2CNT_H = DMA_32BIT; + REG_SOUNDCNT_X = SOUND_MASTER_ENABLE + | SOUND_4_ON + | SOUND_3_ON + | SOUND_2_ON + | SOUND_1_ON; + REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT + | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT + | SOUND_ALL_MIX_FULL; + REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40; + + REG_DMA1SAD = (s32)soundInfo->pcmBuffer; + REG_DMA1DAD = (s32)®_FIFO_A; + REG_DMA2SAD = (s32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE; + REG_DMA2DAD = (s32)®_FIFO_B; + + SOUND_INFO_PTR = soundInfo; + CpuFill32(0, soundInfo, sizeof(struct SoundInfo)); + + soundInfo->maxChans = 8; + soundInfo->masterVolume = 15; + soundInfo->plynote = (u32)ply_note; + soundInfo->CgbSound = DummyFunc; + soundInfo->CgbOscOff = (void (*)(u8))DummyFunc; + soundInfo->MidiKeyToCgbFreq = (u32 (*)(u8, u8, u8))DummyFunc; + soundInfo->ExtVolPit = (u32)DummyFunc; + + MPlayJumpTableCopy(gMPlayJumpTable); + + soundInfo->MPlayJumpTable = (u32)gMPlayJumpTable; + + SampleFreqSet(SOUND_MODE_FREQ_13379); + + soundInfo->ident = ID_NUMBER; +} + +void SampleFreqSet(u32 freq) +{ + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + + freq = (freq & 0xF0000) >> 16; + soundInfo->freq = freq; + soundInfo->pcmSamplesPerVBlank = gPcmSamplesPerVBlankTable[freq - 1]; + soundInfo->pcmDmaPeriod = PCM_DMA_BUF_SIZE / soundInfo->pcmSamplesPerVBlank; + + // LCD refresh rate 59.7275Hz + soundInfo->pcmFreq = (597275 * soundInfo->pcmSamplesPerVBlank + 5000) / 10000; + + // CPU frequency 16.78Mhz + soundInfo->divFreq = (16777216 / soundInfo->pcmFreq + 1) >> 1; + + // Turn off timer 0. + REG_TM0CNT_H = 0; + + // cycles per LCD fresh 280896 + REG_TM0CNT_L = -(280896 / soundInfo->pcmSamplesPerVBlank); + + m4aSoundVSyncOn(); + + while (*(vu8 *)REG_ADDR_VCOUNT == 159) + ; + + while (*(vu8 *)REG_ADDR_VCOUNT != 159) + ; + + REG_TM0CNT_H = TIMER_ENABLE | TIMER_1CLK; +} + +void m4aSoundMode(u32 mode) +{ + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + u32 temp; + + if (soundInfo->ident != ID_NUMBER) + return; + + soundInfo->ident++; + + temp = mode & (SOUND_MODE_REVERB_SET | SOUND_MODE_REVERB_VAL); + + if (temp) + soundInfo->reverb = temp & SOUND_MODE_REVERB_VAL; + + temp = mode & SOUND_MODE_MAXCHN; + + if (temp) + { + struct SoundChannel *chan; + + soundInfo->maxChans = temp >> SOUND_MODE_MAXCHN_SHIFT; + + temp = MAX_DIRECTSOUND_CHANNELS; + chan = &soundInfo->chans[0]; + + while (temp != 0) + { + chan->status = 0; + temp--; + chan++; + } + } + + temp = mode & SOUND_MODE_MASVOL; + + if (temp) + soundInfo->masterVolume = temp >> SOUND_MODE_MASVOL_SHIFT; + + temp = mode & SOUND_MODE_DA_BIT; + + if (temp) + { + temp = (temp & 0x300000) >> 14; + REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | temp; + } + + temp = mode & SOUND_MODE_FREQ; + + if (temp) + { + m4aSoundVSyncOff(); + SampleFreqSet(temp); + } + + soundInfo->ident = ID_NUMBER; +} + +void SoundClear(void) +{ + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + s32 i; + void *chan; + + if (soundInfo->ident != ID_NUMBER) + return; + + soundInfo->ident++; + + i = MAX_DIRECTSOUND_CHANNELS; + chan = &soundInfo->chans[0]; + + while (i > 0) + { + ((struct SoundChannel *)chan)->status = 0; + i--; + chan = (void *)((s32)chan + sizeof(struct SoundChannel)); + } + + chan = soundInfo->cgbChans; + + if (chan) + { + i = 1; + + while (i <= 4) + { + soundInfo->CgbOscOff(i); + ((struct CgbChannel *)chan)->sf = 0; + i++; + chan = (void *)((s32)chan + sizeof(struct CgbChannel)); + } + } + + soundInfo->ident = ID_NUMBER; +} + +void m4aSoundVSyncOff(void) +{ + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + + if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1) + { + soundInfo->ident += 10; + + if (REG_DMA1CNT & (DMA_REPEAT << 16)) + REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + + if (REG_DMA2CNT & (DMA_REPEAT << 16)) + REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + + REG_DMA1CNT_H = DMA_32BIT; + REG_DMA2CNT_H = DMA_32BIT; + + CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer)); + } +} + +void m4aSoundVSyncOn(void) +{ + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + u32 ident = soundInfo->ident; + + if (ident == ID_NUMBER) + return; + + REG_DMA1CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT; + REG_DMA2CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT; + + soundInfo->pcmDmaCounter = 0; + soundInfo->ident = ident - 10; +} + +void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount) +{ + struct SoundInfo *soundInfo; + + if (trackCount == 0) + return; + + if (trackCount > MAX_MUSICPLAYER_TRACKS) + trackCount = MAX_MUSICPLAYER_TRACKS; + + soundInfo = SOUND_INFO_PTR; + + if (soundInfo->ident != ID_NUMBER) + return; + + soundInfo->ident++; + + Clear64byte(mplayInfo); + + mplayInfo->tracks = tracks; + mplayInfo->trackCount = trackCount; + mplayInfo->status = MUSICPLAYER_STATUS_PAUSE; + + while (trackCount != 0) + { + tracks->flags = 0; + trackCount--; + tracks++; + } + + if (soundInfo->func != 0) + { + mplayInfo->func = soundInfo->func; + mplayInfo->intp = soundInfo->intp; + soundInfo->func = 0; + } + + soundInfo->intp = (u32)mplayInfo; + soundInfo->func = (u32)MPlayMain; + soundInfo->ident = ID_NUMBER; + mplayInfo->ident = ID_NUMBER; +} + +void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader) +{ + s32 i; + u8 unk_B; + struct MusicPlayerTrack *track; + + if (mplayInfo->ident != ID_NUMBER) + return; + + unk_B = mplayInfo->unk_B; + + if (!unk_B + || ((!mplayInfo->songHeader || !(mplayInfo->tracks[0].flags & MPT_FLG_START)) + && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0 + || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE))) + || (mplayInfo->priority <= songHeader->priority)) + { + mplayInfo->ident++; + mplayInfo->status = 0; + mplayInfo->songHeader = songHeader; + mplayInfo->tone = songHeader->tone; + mplayInfo->priority = songHeader->priority; + mplayInfo->clock = 0; + mplayInfo->tempoD = 150; + mplayInfo->tempoI = 150; + mplayInfo->tempoU = 0x100; + mplayInfo->tempoC = 0; + mplayInfo->fadeOI = 0; + + i = 0; + track = mplayInfo->tracks; + + while (i < songHeader->trackCount && i < mplayInfo->trackCount) + { + TrackStop(mplayInfo, track); + track->flags = MPT_FLG_EXIST | MPT_FLG_START; + track->chan = 0; + track->cmdPtr = songHeader->part[i]; + i++; + track++; + } + + while (i < mplayInfo->trackCount) + { + TrackStop(mplayInfo, track); + track->flags = 0; + i++; + track++; + } + + if (songHeader->reverb & 0x80) + m4aSoundMode(songHeader->reverb); + + mplayInfo->ident = ID_NUMBER; + } +} + +void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo) +{ + s32 i; + struct MusicPlayerTrack *track; + + if (mplayInfo->ident != ID_NUMBER) + return; + + mplayInfo->ident++; + mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE; + + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + + while (i > 0) + { + TrackStop(mplayInfo, track); + i--; + track++; + } + + mplayInfo->ident = ID_NUMBER; +} + +void FadeOutBody(struct MusicPlayerInfo *mplayInfo) +{ + s32 i; + struct MusicPlayerTrack *track; + u16 fadeOV; +#ifdef NONMATCHING + u16 mask; +#else + register u16 mask asm("r2"); +#endif // NONMATCHING + + if (mplayInfo->fadeOI == 0) + return; + + mplayInfo->fadeOC--; + mask = 0xFFFF; + + if (mplayInfo->fadeOC != 0) + return; + + mplayInfo->fadeOC = mplayInfo->fadeOI; + + if (mplayInfo->fadeOV & FADE_IN) + { + mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT); + + if ((u16)(mplayInfo->fadeOV & mask) >= (64 << FADE_VOL_SHIFT)) + { + mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT); + mplayInfo->fadeOI = 0; + } + } + else + { + mplayInfo->fadeOV -= (4 << FADE_VOL_SHIFT); + + if ((s16)(mplayInfo->fadeOV & mask) <= 0) + { + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + + while (i > 0) + { + u32 val; + + TrackStop(mplayInfo, track); + + val = TEMPORARY_FADE; + fadeOV = mplayInfo->fadeOV; + val &= fadeOV; + + if (!val) + track->flags = 0; + + i--; + track++; + } + + if (mplayInfo->fadeOV & TEMPORARY_FADE) + mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE; + else + mplayInfo->status = MUSICPLAYER_STATUS_PAUSE; + + mplayInfo->fadeOI = 0; + return; + } + } + + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + + while (i > 0) + { + if (track->flags & MPT_FLG_EXIST) + { + fadeOV = mplayInfo->fadeOV; + + track->volX = (fadeOV >> FADE_VOL_SHIFT); + track->flags |= MPT_FLG_VOLCHG; + } + + i--; + track++; + } +} + +void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + if (track->flags & MPT_FLG_VOLSET) + { + s32 x; + s32 y; + + x = (u32)(track->vol * track->volX) >> 5; + + if (track->modT == 1) + x = (u32)(x * (track->modM + 128)) >> 7; + + y = 2 * track->pan + track->panX; + + if (track->modT == 2) + y += track->modM; + + if (y < -128) + y = -128; + else if (y > 127) + y = 127; + + track->volMR = (u32)((y + 128) * x) >> 8; + track->volML = (u32)((127 - y) * x) >> 8; + } + + if (track->flags & MPT_FLG_PITSET) + { + s32 bend = track->bend * track->bendRange; + s32 x = (track->tune + bend) + * 4 + + (track->keyShift << 8) + + (track->keyShiftX << 8) + + track->pitX; + + if (track->modT == 0) + x += 16 * track->modM; + + track->keyM = x >> 8; + track->pitM = x; + } + + track->flags &= ~(MPT_FLG_PITSET | MPT_FLG_VOLSET); +} + +u32 MidiKeyToCgbFreq(u8 chanNum, u8 key, u8 fineAdjust) +{ + if (chanNum == 4) + { + if (key <= 20) + { + key = 0; + } + else + { + key -= 21; + if (key > 59) + key = 59; + } + + return gNoiseTable[key]; + } + else + { + s32 val1; + s32 val2; + + if (key <= 35) + { + fineAdjust = 0; + key = 0; + } + else + { + key -= 36; + if (key > 130) + { + key = 130; + fineAdjust = 255; + } + } + + val1 = gCgbScaleTable[key]; + val1 = gCgbFreqTable[val1 & 0xF] >> (val1 >> 4); + + val2 = gCgbScaleTable[key + 1]; + val2 = gCgbFreqTable[val2 & 0xF] >> (val2 >> 4); + + return val1 + ((fineAdjust * (val2 - val1)) >> 8) + 2048; + } +} + +void CgbOscOff(u8 chanNum) +{ + switch (chanNum) + { + case 1: + REG_NR12 = 8; + REG_NR14 = 0x80; + break; + case 2: + REG_NR22 = 8; + REG_NR24 = 0x80; + break; + case 3: + REG_NR30 = 0; + break; + default: + REG_NR42 = 8; + REG_NR44 = 0x80; + } +} + +static inline int CgbPan(struct CgbChannel *chan) +{ + u32 rightVolume = chan->rightVolume; + u32 leftVolume = chan->leftVolume; + + if ((rightVolume = (u8)rightVolume) >= (leftVolume = (u8)leftVolume)) + { + if (rightVolume / 2 >= leftVolume) + { + chan->pan = 0x0F; + return 1; + } + } + else + { + if (leftVolume / 2 >= rightVolume) + { + chan->pan = 0xF0; + return 1; + } + } + + return 0; +} + +void CgbModVol(struct CgbChannel *chan) +{ + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + + if ((soundInfo->mode & 1) || !CgbPan(chan)) + { + chan->pan = 0xFF; + chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4; + } + else + { + // Force chan->rightVolume and chan->leftVolume to be read from memory again, + // even though there is no reason to do so. + // The command line option "-fno-gcse" achieves the same result as this. + asm("" : : : "memory"); + + chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4; + if (chan->eg > 15) + chan->eg = 15; + } + + chan->sg = (chan->eg * chan->su + 15) >> 4; + chan->pan &= chan->panMask; +} + +void CgbSound(void) +{ + s32 ch; + struct CgbChannel *channels; + s32 evAdd; + s32 prevC15; + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + vu8 *nrx0ptr; + vu8 *nrx1ptr; + vu8 *nrx2ptr; + vu8 *nrx3ptr; + vu8 *nrx4ptr; + + // Most comparision operations that cast to s8 perform 'and' by 0xFF. + int mask = 0xff; + + if (soundInfo->c15) + soundInfo->c15--; + else + soundInfo->c15 = 14; + + for (ch = 1, channels = soundInfo->cgbChans; ch <= 4; ch++, channels++) + { + if (!(channels->sf & 0xc7)) + continue; + + switch (ch) + { + case 1: + nrx0ptr = (vu8 *)(REG_ADDR_NR10); + nrx1ptr = (vu8 *)(REG_ADDR_NR11); + nrx2ptr = (vu8 *)(REG_ADDR_NR12); + nrx3ptr = (vu8 *)(REG_ADDR_NR13); + nrx4ptr = (vu8 *)(REG_ADDR_NR14); + break; + case 2: + nrx0ptr = (vu8 *)(REG_ADDR_NR10+1); + nrx1ptr = (vu8 *)(REG_ADDR_NR21); + nrx2ptr = (vu8 *)(REG_ADDR_NR22); + nrx3ptr = (vu8 *)(REG_ADDR_NR23); + nrx4ptr = (vu8 *)(REG_ADDR_NR24); + break; + case 3: + nrx0ptr = (vu8 *)(REG_ADDR_NR30); + nrx1ptr = (vu8 *)(REG_ADDR_NR31); + nrx2ptr = (vu8 *)(REG_ADDR_NR32); + nrx3ptr = (vu8 *)(REG_ADDR_NR33); + nrx4ptr = (vu8 *)(REG_ADDR_NR34); + break; + default: + nrx0ptr = (vu8 *)(REG_ADDR_NR30+1); + nrx1ptr = (vu8 *)(REG_ADDR_NR41); + nrx2ptr = (vu8 *)(REG_ADDR_NR42); + nrx3ptr = (vu8 *)(REG_ADDR_NR43); + nrx4ptr = (vu8 *)(REG_ADDR_NR44); + break; + } + + prevC15 = soundInfo->c15; + evAdd = *nrx2ptr; + + if (channels->sf & 0x80) + { + if (!(channels->sf & 0x40)) + { + channels->sf = 3; + channels->mo = 3; + CgbModVol(channels); + switch (ch) + { + case 1: + *nrx0ptr = channels->sw; + // fallthrough + case 2: + *nrx1ptr = ((u32)channels->wp << 6) + channels->le; + goto loc_82E0E30; + case 3: + if ((u32)channels->wp != channels->cp) + { + *nrx0ptr = 0x40; + REG_WAVE_RAM0 = channels->wp[0]; + REG_WAVE_RAM1 = channels->wp[1]; + REG_WAVE_RAM2 = channels->wp[2]; + REG_WAVE_RAM3 = channels->wp[3]; + channels->cp = (u32)channels->wp; + } + *nrx0ptr = 0; + *nrx1ptr = channels->le; + if (channels->le) + channels->n4 = -64; + else + channels->n4 = -128; + break; + default: + *nrx1ptr = channels->le; + *nrx3ptr = (u32)channels->wp << 3; + loc_82E0E30: + evAdd = channels->at + 8; + if (channels->le) + channels->n4 = 64; + else + channels->n4 = 0; + break; + } + channels->ec = channels->at; + if ((s8)(channels->at & mask)) + { + channels->ev = 0; + goto EC_MINUS; + } + else + { + goto loc_82E0F96; + } + } + else + { + goto loc_82E0E82; + } + } + else if (channels->sf & 0x04) + { + channels->echoLength--; + if ((s8)(channels->echoLength & mask) <= 0) + { + loc_82E0E82: + CgbOscOff(ch); + channels->sf = 0; + goto LAST_LABEL; + } + goto loc_82E0FD6; + } + else if ((channels->sf & 0x40) && (channels->sf & 0x03)) + { + channels->sf &= 0xfc; + channels->ec = channels->re; + if ((s8)(channels->re & mask)) + { + channels->mo |= 1; + if (ch != 3) + { + evAdd = channels->re; + } + goto EC_MINUS; + } + else + { + goto loc_82E0F02; + } + } + else + { + loc_82E0ED0: + if (channels->ec == 0) + { + if (ch == 3) + { + channels->mo |= 1; + } + CgbModVol(channels); + if ((channels->sf & 0x3) == 0) + { + channels->ev--; + if ((s8)(channels->ev & mask) <= 0) + { + loc_82E0F02: + channels->ev = ((channels->eg * channels->echoVolume) + 0xFF) >> 8; + if (channels->ev) + { + channels->sf |= 0x4; + channels->mo |= 1; + if (ch != 3) + { + evAdd = 8; + } + goto loc_82E0FD6; + } + else + { + goto loc_82E0E82; + } + } + else + { + channels->ec = channels->re; + } + } + else if ((channels->sf & 0x3) == 1) + { + loc_82E0F3A: + channels->ev = channels->sg; + channels->ec = 7; + } + else if ((channels->sf & 0x3) == 2) + { + int ev, sg; + + channels->ev--; + ev = (s8)(channels->ev & mask); + sg = (s8)(channels->sg); + if (ev <= sg) + { + loc_82E0F5A: + if (channels->su == 0) + { + channels->sf &= 0xfc; + goto loc_82E0F02; + } + else + { + channels->sf--; + channels->mo |= 1; + if (ch != 3) + { + evAdd = 8; + } + goto loc_82E0F3A; + } + } + else + { + channels->ec = channels->de; + } + } + else + { + channels->ev++; + if ((u8)(channels->ev & mask) >= channels->eg) + { + loc_82E0F96: + channels->sf--; + channels->ec = channels->de; + if ((u8)(channels->ec & mask)) + { + channels->mo |= 1; + channels->ev = channels->eg; + if (ch != 3) + { + evAdd = channels->de; + } + } + else + { + goto loc_82E0F5A; + } + } + else + { + channels->ec = channels->at; + } + } + } + } + + EC_MINUS: + channels->ec--; + if (prevC15 == 0) + { + prevC15--; + goto loc_82E0ED0; + } + + loc_82E0FD6: + if (channels->mo & 0x2) + { + if (ch < 4 && (channels->ty & 0x08)) + { + int biasH = REG_SOUNDBIAS_H; + + if (biasH < 64) + { + channels->fr = (channels->fr + 2) & 0x7fc; + } + else if (biasH < 128) + { + channels->fr = (channels->fr + 1) & 0x7fe; + } + } + if (ch != 4) + { + *nrx3ptr = channels->fr; + } + else + { + *nrx3ptr = (*nrx3ptr & 0x08) | channels->fr; + } + channels->n4 = (channels->n4 & 0xC0) + (*((u8*)(&channels->fr) + 1)); + *nrx4ptr = (s8)(channels->n4 & mask); + } + + if (channels->mo & 1) + { + REG_NR51 = (REG_NR51 & ~channels->panMask) | channels->pan; + if (ch == 3) + { + *nrx2ptr = gCgb3Vol[channels->ev]; + if (channels->n4 & 0x80) + { + *nrx0ptr = 0x80; + *nrx4ptr = channels->n4; + channels->n4 &= 0x7f; + } + } + else + { + evAdd &= 0xf; + *nrx2ptr = (channels->ev << 4) + evAdd; + *nrx4ptr = channels->n4 | 0x80; + if (ch == 1 && !(*nrx0ptr & 0x08)) + { + *nrx4ptr = channels->n4 | 0x80; + } + } + } + + LAST_LABEL: + channels->mo = 0; + } +} + +void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo) +{ + if (mplayInfo->ident == ID_NUMBER) + { + mplayInfo->ident++; + mplayInfo->tempoU = tempo; + mplayInfo->tempoI = (mplayInfo->tempoD * mplayInfo->tempoU) >> 8; + mplayInfo->ident = ID_NUMBER; + } +} + +void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume) +{ + s32 i; + u32 bit; + struct MusicPlayerTrack *track; + + if (mplayInfo->ident != ID_NUMBER) + return; + + mplayInfo->ident++; + + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + bit = 1; + + while (i > 0) + { + if (trackBits & bit) + { + if (track->flags & MPT_FLG_EXIST) + { + track->volX = volume / 4; + track->flags |= MPT_FLG_VOLCHG; + } + } + + i--; + track++; + bit <<= 1; + } + + mplayInfo->ident = ID_NUMBER; +} + +void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch) +{ + s32 i; + u32 bit; + struct MusicPlayerTrack *track; + + if (mplayInfo->ident != ID_NUMBER) + return; + + mplayInfo->ident++; + + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + bit = 1; + + while (i > 0) + { + if (trackBits & bit) + { + if (track->flags & MPT_FLG_EXIST) + { + track->keyShiftX = pitch >> 8; + track->pitX = pitch; + track->flags |= MPT_FLG_PITCHG; + } + } + + i--; + track++; + bit <<= 1; + } + + mplayInfo->ident = ID_NUMBER; +} + +void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan) +{ + s32 i; + u32 bit; + struct MusicPlayerTrack *track; + + if (mplayInfo->ident != ID_NUMBER) + return; + + mplayInfo->ident++; + + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + bit = 1; + + while (i > 0) + { + if (trackBits & bit) + { + if (track->flags & MPT_FLG_EXIST) + { + track->panX = pan; + track->flags |= MPT_FLG_VOLCHG; + } + } + + i--; + track++; + bit <<= 1; + } + + mplayInfo->ident = ID_NUMBER; +} + +void ClearModM(struct MusicPlayerTrack *track) +{ + track->lfoSpeedC = 0; + track->modM = 0; + + if (track->modT == 0) + track->flags |= MPT_FLG_PITCHG; + else + track->flags |= MPT_FLG_VOLCHG; +} + +void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth) +{ + s32 i; + u32 bit; + struct MusicPlayerTrack *track; + + if (mplayInfo->ident != ID_NUMBER) + return; + + mplayInfo->ident++; + + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + bit = 1; + + while (i > 0) + { + if (trackBits & bit) + { + if (track->flags & MPT_FLG_EXIST) + { + track->mod = modDepth; + + if (!track->mod) + ClearModM(track); + } + } + + i--; + track++; + bit <<= 1; + } + + mplayInfo->ident = ID_NUMBER; +} + +void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed) +{ + s32 i; + u32 bit; + struct MusicPlayerTrack *track; + + if (mplayInfo->ident != ID_NUMBER) + return; + + mplayInfo->ident++; + + i = mplayInfo->trackCount; + track = mplayInfo->tracks; + bit = 1; + + while (i > 0) + { + if (trackBits & bit) + { + if (track->flags & MPT_FLG_EXIST) + { + track->lfoSpeed = lfoSpeed; + + if (!track->lfoSpeed) + ClearModM(track); + } + } + + i--; + track++; + bit <<= 1; + } + + mplayInfo->ident = ID_NUMBER; +} + +#define MEMACC_COND_JUMP(cond) \ +if (cond) \ + goto cond_true; \ +else \ + goto cond_false; \ + +void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + u32 op; + u8 *addr; + u8 data; + + op = *track->cmdPtr; + track->cmdPtr++; + + addr = mplayInfo->memAccArea + *track->cmdPtr; + track->cmdPtr++; + + data = *track->cmdPtr; + track->cmdPtr++; + + switch (op) + { + case 0: + *addr = data; + return; + case 1: + *addr += data; + return; + case 2: + *addr -= data; + return; + case 3: + *addr = mplayInfo->memAccArea[data]; + return; + case 4: + *addr += mplayInfo->memAccArea[data]; + return; + case 5: + *addr -= mplayInfo->memAccArea[data]; + return; + case 6: + MEMACC_COND_JUMP(*addr == data) + return; + case 7: + MEMACC_COND_JUMP(*addr != data) + return; + case 8: + MEMACC_COND_JUMP(*addr > data) + return; + case 9: + MEMACC_COND_JUMP(*addr >= data) + return; + case 10: + MEMACC_COND_JUMP(*addr <= data) + return; + case 11: + MEMACC_COND_JUMP(*addr < data) + return; + case 12: + MEMACC_COND_JUMP(*addr == mplayInfo->memAccArea[data]) + return; + case 13: + MEMACC_COND_JUMP(*addr != mplayInfo->memAccArea[data]) + return; + case 14: + MEMACC_COND_JUMP(*addr > mplayInfo->memAccArea[data]) + return; + case 15: + MEMACC_COND_JUMP(*addr >= mplayInfo->memAccArea[data]) + return; + case 16: + MEMACC_COND_JUMP(*addr <= mplayInfo->memAccArea[data]) + return; + case 17: + MEMACC_COND_JUMP(*addr < mplayInfo->memAccArea[data]) + return; + default: + return; + } + +cond_true: + { + void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[1]); + func(mplayInfo, track); + return; + } + +cond_false: + track->cmdPtr += 4; +} + +void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + u32 n = *track->cmdPtr; + track->cmdPtr++; + + gXcmdTable[n](mplayInfo, track); +} + +void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[0]); + func(mplayInfo, track); +} + +#define READ_XCMD_BYTE(var, n) \ +{ \ + u32 byte = track->cmdPtr[(n)]; \ + byte <<= n * 8; \ + (var) &= ~(0xFF << (n * 8)); \ + (var) |= byte; \ +} + +void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + u32 wav; + + READ_XCMD_BYTE(wav, 0) // UB: uninitialized variable + READ_XCMD_BYTE(wav, 1) + READ_XCMD_BYTE(wav, 2) + READ_XCMD_BYTE(wav, 3) + + track->tone.wav = (struct WaveData *)wav; + track->cmdPtr += 4; +} + +void ply_xtype(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->tone.type = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xatta(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->tone.attack = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xdeca(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->tone.decay = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xsust(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->tone.sustain = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xrele(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->tone.release = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xiecv(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->echoVolume = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xiecl(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->echoLength = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xleng(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->tone.length = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xswee(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + track->tone.pan_sweep = *track->cmdPtr; + track->cmdPtr++; +} + +void ply_xcmd_0C(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + u32 unk; + + READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable + READ_XCMD_BYTE(unk, 1) + + if (track->unk_3A < (u16)unk) + { + track->unk_3A++; + track->cmdPtr -= 2; + track->wait = 1; + } + else + { + track->unk_3A = 0; + track->cmdPtr += 2; + } +} + +void ply_xcmd_0D(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) +{ + u32 unk; + + READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable + READ_XCMD_BYTE(unk, 1) + READ_XCMD_BYTE(unk, 2) + READ_XCMD_BYTE(unk, 3) + + track->unk_3C = unk; + track->cmdPtr += 4; +} + +void DummyFunc(void) +{ +} + +struct MusicPlayerInfo *SetPokemonCryTone(struct ToneData *tone) +{ + u32 maxClock = 0; + s32 maxClockIndex = 0; + s32 i; + struct MusicPlayerInfo *mplayInfo; + + for (i = 0; i < MAX_POKEMON_CRIES; i++) + { + struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2]; + + if (!track->flags && (!track->chan || track->chan->track != track)) + goto start_song; + + if (maxClock < gPokemonCryMusicPlayers[i].clock) + { + maxClock = gPokemonCryMusicPlayers[i].clock; + maxClockIndex = i; + } + } + + i = maxClockIndex; + +start_song: + mplayInfo = &gPokemonCryMusicPlayers[i]; + mplayInfo->ident++; + +#define CRY ((s32)&gPokemonCrySongs + i * sizeof(struct PokemonCrySong)) +#define CRY_OFS(field) offsetof(struct PokemonCrySong, field) + + memcpy((void *)CRY, &gPokemonCrySong, sizeof(struct PokemonCrySong)); + + *(u32 *)(CRY + CRY_OFS(tone)) = (u32)tone; + *(u32 *)(CRY + CRY_OFS(part)) = CRY + CRY_OFS(part0); + *(u32 *)(CRY + CRY_OFS(part) + 4) = CRY + CRY_OFS(part1); + *(u32 *)(CRY + CRY_OFS(gotoTarget)) = CRY + CRY_OFS(cont); + +#undef CRY_OFS +#undef CRY + + mplayInfo->ident = ID_NUMBER; + + MPlayStart(mplayInfo, (struct SongHeader *)(&gPokemonCrySongs[i])); + + return mplayInfo; +} + +void SetPokemonCryVolume(u8 val) +{ + gPokemonCrySong.volumeValue = val & 0x7F; +} + +void SetPokemonCryPanpot(s8 val) +{ + gPokemonCrySong.panValue = (val + C_V) & 0x7F; +} + +void SetPokemonCryPitch(s16 val) +{ + s16 b = val + 0x80; + u8 a = gPokemonCrySong.tuneValue2 - gPokemonCrySong.tuneValue; + gPokemonCrySong.tieKeyValue = (b >> 8) & 0x7F; + gPokemonCrySong.tuneValue = (b >> 1) & 0x7F; + gPokemonCrySong.tuneValue2 = (a + ((b >> 1) & 0x7F)) & 0x7F; +} + +void SetPokemonCryLength(u16 val) +{ + gPokemonCrySong.unkCmd0CParam = val; +} + +void SetPokemonCryRelease(u8 val) +{ + gPokemonCrySong.releaseValue = val; +} + +void SetPokemonCryProgress(u32 val) +{ + gPokemonCrySong.unkCmd0DParam = val; +} + +int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo) +{ + struct MusicPlayerTrack *track = mplayInfo->tracks; + + if (track->chan && track->chan->track == track) + return 1; + else + return 0; +} + +void SetPokemonCryChorus(s8 val) +{ + if (val) + { + gPokemonCrySong.trackCount = 2; + gPokemonCrySong.tuneValue2 = (val + gPokemonCrySong.tuneValue) & 0x7F; + } + else + { + gPokemonCrySong.trackCount = 1; + } +} + +void SetPokemonCryStereo(u32 val) +{ + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + + if (val) + { + REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT + | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT + | SOUND_ALL_MIX_FULL; + soundInfo->mode &= ~1; + } + else + { + REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT | SOUND_B_RIGHT_OUTPUT + | SOUND_A_TIMER_0 | SOUND_A_LEFT_OUTPUT | SOUND_A_RIGHT_OUTPUT + | SOUND_B_MIX_HALF | SOUND_A_MIX_HALF | SOUND_CGB_MIX_FULL; + soundInfo->mode |= 1; + } +} + +void SetPokemonCryPriority(u8 val) +{ + gPokemonCrySong.priority = val; +} diff --git a/src/m4a_2.c b/src/m4a_2.c deleted file mode 100644 index 0625f05d19..0000000000 --- a/src/m4a_2.c +++ /dev/null @@ -1,912 +0,0 @@ -#include "gba/m4a_internal.h" - -#define BSS_CODE __attribute__((section(".bss.code"))) - -BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0}; - -struct SoundInfo gSoundInfo; -struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES]; -struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES]; -void *gMPlayJumpTable[36]; -struct CgbChannel gCgbChans[4]; -struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2]; -struct PokemonCrySong gPokemonCrySong; -struct MusicPlayerInfo gMPlayInfo_BGM; -struct MusicPlayerInfo gMPlayInfo_SE1; -struct MusicPlayerInfo gMPlayInfo_SE2; -struct MusicPlayerInfo gMPlayInfo_SE3; -u8 gMPlayMemAccArea[0x10]; - -u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) -{ - u32 val1; - u32 val2; - u32 fineAdjustShifted = fineAdjust << 24; - - if (key > 178) - { - key = 178; - fineAdjustShifted = 255 << 24; - } - - val1 = gScaleTable[key]; - val1 = gFreqTable[val1 & 0xF] >> (val1 >> 4); - - val2 = gScaleTable[key + 1]; - val2 = gFreqTable[val2 & 0xF] >> (val2 >> 4); - - return umul3232H32(wav->freq, val1 + umul3232H32(val2 - val1, fineAdjustShifted)); -} - -void UnusedDummyFunc() -{ -} - -void MPlayContinue(struct MusicPlayerInfo *mplayInfo) -{ - if (mplayInfo->ident == ID_NUMBER) - { - mplayInfo->ident++; - mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE; - mplayInfo->ident = ID_NUMBER; - } -} - -void MPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed) -{ - if (mplayInfo->ident == ID_NUMBER) - { - mplayInfo->ident++; - mplayInfo->fadeOC = speed; - mplayInfo->fadeOI = speed; - mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT); - mplayInfo->ident = ID_NUMBER; - } -} - -void m4aSoundInit(void) -{ - s32 i; - - CpuCopy32((void *)((s32)SoundMainRAM & ~1), SoundMainRAM_Buffer, sizeof(SoundMainRAM_Buffer)); - - SoundInit(&gSoundInfo); - MPlayExtender(gCgbChans); - m4aSoundMode(SOUND_MODE_DA_BIT_8 - | SOUND_MODE_FREQ_13379 - | (12 << SOUND_MODE_MASVOL_SHIFT) - | (5 << SOUND_MODE_MAXCHN_SHIFT)); - - for (i = 0; i < NUM_MUSIC_PLAYERS; i++) - { - struct MusicPlayerInfo *mplayInfo = gMPlayTable[i].info; - MPlayOpen(mplayInfo, gMPlayTable[i].track, gMPlayTable[i].unk_8); - mplayInfo->unk_B = gMPlayTable[i].unk_A; - mplayInfo->memAccArea = gMPlayMemAccArea; - } - - memcpy(&gPokemonCrySong, &gPokemonCrySongTemplate, sizeof(struct PokemonCrySong)); - - for (i = 0; i < MAX_POKEMON_CRIES; i++) - { - struct MusicPlayerInfo *mplayInfo = &gPokemonCryMusicPlayers[i]; - struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2]; - MPlayOpen(mplayInfo, track, 2); - track->chan = 0; - } -} - -void m4aSoundMain(void) -{ - SoundMain(); -} - -void m4aSongNumStart(u16 n) -{ - const struct MusicPlayer *mplayTable = gMPlayTable; - const struct Song *songTable = gSongTable; - const struct Song *song = &songTable[n]; - const struct MusicPlayer *mplay = &mplayTable[song->ms]; - - MPlayStart(mplay->info, song->header); -} - -void m4aSongNumStartOrChange(u16 n) -{ - const struct MusicPlayer *mplayTable = gMPlayTable; - const struct Song *songTable = gSongTable; - const struct Song *song = &songTable[n]; - const struct MusicPlayer *mplay = &mplayTable[song->ms]; - - if (mplay->info->songHeader != song->header) - { - MPlayStart(mplay->info, song->header); - } - else - { - if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0 - || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)) - { - MPlayStart(mplay->info, song->header); - } - } -} - -void m4aSongNumStartOrContinue(u16 n) -{ - const struct MusicPlayer *mplayTable = gMPlayTable; - const struct Song *songTable = gSongTable; - const struct Song *song = &songTable[n]; - const struct MusicPlayer *mplay = &mplayTable[song->ms]; - - if (mplay->info->songHeader != song->header) - MPlayStart(mplay->info, song->header); - else if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0) - MPlayStart(mplay->info, song->header); - else if (mplay->info->status & MUSICPLAYER_STATUS_PAUSE) - MPlayContinue(mplay->info); -} - -void m4aSongNumStop(u16 n) -{ - const struct MusicPlayer *mplayTable = gMPlayTable; - const struct Song *songTable = gSongTable; - const struct Song *song = &songTable[n]; - const struct MusicPlayer *mplay = &mplayTable[song->ms]; - - if (mplay->info->songHeader == song->header) - m4aMPlayStop(mplay->info); -} - -void m4aSongNumContinue(u16 n) -{ - const struct MusicPlayer *mplayTable = gMPlayTable; - const struct Song *songTable = gSongTable; - const struct Song *song = &songTable[n]; - const struct MusicPlayer *mplay = &mplayTable[song->ms]; - - if (mplay->info->songHeader == song->header) - MPlayContinue(mplay->info); -} - -void m4aMPlayAllStop(void) -{ - s32 i; - - for (i = 0; i < NUM_MUSIC_PLAYERS; i++) - m4aMPlayStop(gMPlayTable[i].info); - - for (i = 0; i < MAX_POKEMON_CRIES; i++) - m4aMPlayStop(&gPokemonCryMusicPlayers[i]); -} - -void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo) -{ - MPlayContinue(mplayInfo); -} - -void m4aMPlayAllContinue(void) -{ - s32 i; - - for (i = 0; i < NUM_MUSIC_PLAYERS; i++) - MPlayContinue(gMPlayTable[i].info); - - for (i = 0; i < MAX_POKEMON_CRIES; i++) - MPlayContinue(&gPokemonCryMusicPlayers[i]); -} - -void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed) -{ - MPlayFadeOut(mplayInfo, speed); -} - -void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed) -{ - if (mplayInfo->ident == ID_NUMBER) - { - mplayInfo->ident++; - mplayInfo->fadeOC = speed; - mplayInfo->fadeOI = speed; - mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT) | TEMPORARY_FADE; - mplayInfo->ident = ID_NUMBER; - } -} - -void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed) -{ - if (mplayInfo->ident == ID_NUMBER) - { - mplayInfo->ident++; - mplayInfo->fadeOC = speed; - mplayInfo->fadeOI = speed; - mplayInfo->fadeOV = (0 << FADE_VOL_SHIFT) | FADE_IN; - mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE; - mplayInfo->ident = ID_NUMBER; - } -} - -void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo) -{ - s32 trackCount = mplayInfo->trackCount; - struct MusicPlayerTrack *track = mplayInfo->tracks; - - while (trackCount > 0) - { - if (track->flags & MPT_FLG_EXIST) - { - if (track->flags & MPT_FLG_START) - { - Clear64byte(track); - track->flags = MPT_FLG_EXIST; - track->bendRange = 2; - track->volX = 64; - track->lfoSpeed = 22; - track->tone.type = 1; - } - } - - trackCount--; - track++; - } -} - -void MPlayExtender(struct CgbChannel *cgbChans) -{ - struct SoundInfo *soundInfo; - u32 ident; - - REG_SOUNDCNT_X = SOUND_MASTER_ENABLE - | SOUND_4_ON - | SOUND_3_ON - | SOUND_2_ON - | SOUND_1_ON; - REG_SOUNDCNT_L = 0; // set master volume to zero - REG_NR12 = 0x8; - REG_NR22 = 0x8; - REG_NR42 = 0x8; - REG_NR14 = 0x80; - REG_NR24 = 0x80; - REG_NR44 = 0x80; - REG_NR30 = 0; - REG_NR50 = 0x77; - - soundInfo = SOUND_INFO_PTR; - - ident = soundInfo->ident; - - if (ident != ID_NUMBER) - return; - - soundInfo->ident++; - - gMPlayJumpTable[8] = ply_memacc; - gMPlayJumpTable[17] = ply_lfos; - gMPlayJumpTable[19] = ply_mod; - gMPlayJumpTable[28] = ply_xcmd; - gMPlayJumpTable[29] = ply_endtie; - gMPlayJumpTable[30] = SampleFreqSet; - gMPlayJumpTable[31] = TrackStop; - gMPlayJumpTable[32] = FadeOutBody; - gMPlayJumpTable[33] = TrkVolPitSet; - - soundInfo->cgbChans = (struct CgbChannel *)cgbChans; - soundInfo->CgbSound = CgbSound; - soundInfo->CgbOscOff = CgbOscOff; - soundInfo->MidiKeyToCgbFreq = MidiKeyToCgbFreq; - soundInfo->maxLines = MAX_LINES; - - CpuFill32(0, cgbChans, sizeof(struct CgbChannel) * 4); - - cgbChans[0].ty = 1; - cgbChans[0].panMask = 0x11; - cgbChans[1].ty = 2; - cgbChans[1].panMask = 0x22; - cgbChans[2].ty = 3; - cgbChans[2].panMask = 0x44; - cgbChans[3].ty = 4; - cgbChans[3].panMask = 0x88; - - soundInfo->ident = ident; -} - -void MusicPlayerJumpTableCopy(void) -{ - asm("swi 0x2A"); -} - -void ClearChain(void *x) -{ - void (*func)(void *) = *(&gMPlayJumpTable[34]); - func(x); -} - -void Clear64byte(void *x) -{ - void (*func)(void *) = *(&gMPlayJumpTable[35]); - func(x); -} - -void SoundInit(struct SoundInfo *soundInfo) -{ - soundInfo->ident = 0; - - if (REG_DMA1CNT & (DMA_REPEAT << 16)) - REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - - if (REG_DMA2CNT & (DMA_REPEAT << 16)) - REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - - REG_DMA1CNT_H = DMA_32BIT; - REG_DMA2CNT_H = DMA_32BIT; - REG_SOUNDCNT_X = SOUND_MASTER_ENABLE - | SOUND_4_ON - | SOUND_3_ON - | SOUND_2_ON - | SOUND_1_ON; - REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT - | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT - | SOUND_ALL_MIX_FULL; - REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40; - - REG_DMA1SAD = (s32)soundInfo->pcmBuffer; - REG_DMA1DAD = (s32)®_FIFO_A; - REG_DMA2SAD = (s32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE; - REG_DMA2DAD = (s32)®_FIFO_B; - - SOUND_INFO_PTR = soundInfo; - CpuFill32(0, soundInfo, sizeof(struct SoundInfo)); - - soundInfo->maxChans = 8; - soundInfo->masterVolume = 15; - soundInfo->plynote = (u32)ply_note; - soundInfo->CgbSound = DummyFunc; - soundInfo->CgbOscOff = (void (*)(u8))DummyFunc; - soundInfo->MidiKeyToCgbFreq = (u32 (*)(u8, u8, u8))DummyFunc; - soundInfo->ExtVolPit = (u32)DummyFunc; - - MPlayJumpTableCopy(gMPlayJumpTable); - - soundInfo->MPlayJumpTable = (u32)gMPlayJumpTable; - - SampleFreqSet(SOUND_MODE_FREQ_13379); - - soundInfo->ident = ID_NUMBER; -} - -void SampleFreqSet(u32 freq) -{ - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - - freq = (freq & 0xF0000) >> 16; - soundInfo->freq = freq; - soundInfo->pcmSamplesPerVBlank = gPcmSamplesPerVBlankTable[freq - 1]; - soundInfo->pcmDmaPeriod = PCM_DMA_BUF_SIZE / soundInfo->pcmSamplesPerVBlank; - - // LCD refresh rate 59.7275Hz - soundInfo->pcmFreq = (597275 * soundInfo->pcmSamplesPerVBlank + 5000) / 10000; - - // CPU frequency 16.78Mhz - soundInfo->divFreq = (16777216 / soundInfo->pcmFreq + 1) >> 1; - - // Turn off timer 0. - REG_TM0CNT_H = 0; - - // cycles per LCD fresh 280896 - REG_TM0CNT_L = -(280896 / soundInfo->pcmSamplesPerVBlank); - - m4aSoundVSyncOn(); - - while (*(vu8 *)REG_ADDR_VCOUNT == 159) - ; - - while (*(vu8 *)REG_ADDR_VCOUNT != 159) - ; - - REG_TM0CNT_H = TIMER_ENABLE | TIMER_1CLK; -} - -void m4aSoundMode(u32 mode) -{ - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - u32 temp; - - if (soundInfo->ident != ID_NUMBER) - return; - - soundInfo->ident++; - - temp = mode & (SOUND_MODE_REVERB_SET | SOUND_MODE_REVERB_VAL); - - if (temp) - soundInfo->reverb = temp & SOUND_MODE_REVERB_VAL; - - temp = mode & SOUND_MODE_MAXCHN; - - if (temp) - { - struct SoundChannel *chan; - - soundInfo->maxChans = temp >> SOUND_MODE_MAXCHN_SHIFT; - - temp = MAX_DIRECTSOUND_CHANNELS; - chan = &soundInfo->chans[0]; - - while (temp != 0) - { - chan->status = 0; - temp--; - chan++; - } - } - - temp = mode & SOUND_MODE_MASVOL; - - if (temp) - soundInfo->masterVolume = temp >> SOUND_MODE_MASVOL_SHIFT; - - temp = mode & SOUND_MODE_DA_BIT; - - if (temp) - { - temp = (temp & 0x300000) >> 14; - REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | temp; - } - - temp = mode & SOUND_MODE_FREQ; - - if (temp) - { - m4aSoundVSyncOff(); - SampleFreqSet(temp); - } - - soundInfo->ident = ID_NUMBER; -} - -void SoundClear(void) -{ - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - s32 i; - void *chan; - - if (soundInfo->ident != ID_NUMBER) - return; - - soundInfo->ident++; - - i = MAX_DIRECTSOUND_CHANNELS; - chan = &soundInfo->chans[0]; - - while (i > 0) - { - ((struct SoundChannel *)chan)->status = 0; - i--; - chan = (void *)((s32)chan + sizeof(struct SoundChannel)); - } - - chan = soundInfo->cgbChans; - - if (chan) - { - i = 1; - - while (i <= 4) - { - soundInfo->CgbOscOff(i); - ((struct CgbChannel *)chan)->sf = 0; - i++; - chan = (void *)((s32)chan + sizeof(struct CgbChannel)); - } - } - - soundInfo->ident = ID_NUMBER; -} - -void m4aSoundVSyncOff(void) -{ - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - - if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1) - { - soundInfo->ident += 10; - - if (REG_DMA1CNT & (DMA_REPEAT << 16)) - REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - - if (REG_DMA2CNT & (DMA_REPEAT << 16)) - REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - - REG_DMA1CNT_H = DMA_32BIT; - REG_DMA2CNT_H = DMA_32BIT; - - CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer)); - } -} - -void m4aSoundVSyncOn(void) -{ - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - u32 ident = soundInfo->ident; - - if (ident == ID_NUMBER) - return; - - REG_DMA1CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT; - REG_DMA2CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT; - - soundInfo->pcmDmaCounter = 0; - soundInfo->ident = ident - 10; -} - -void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount) -{ - struct SoundInfo *soundInfo; - - if (trackCount == 0) - return; - - if (trackCount > MAX_MUSICPLAYER_TRACKS) - trackCount = MAX_MUSICPLAYER_TRACKS; - - soundInfo = SOUND_INFO_PTR; - - if (soundInfo->ident != ID_NUMBER) - return; - - soundInfo->ident++; - - Clear64byte(mplayInfo); - - mplayInfo->tracks = tracks; - mplayInfo->trackCount = trackCount; - mplayInfo->status = MUSICPLAYER_STATUS_PAUSE; - - while (trackCount != 0) - { - tracks->flags = 0; - trackCount--; - tracks++; - } - - if (soundInfo->func != 0) - { - mplayInfo->func = soundInfo->func; - mplayInfo->intp = soundInfo->intp; - soundInfo->func = 0; - } - - soundInfo->intp = (u32)mplayInfo; - soundInfo->func = (u32)MPlayMain; - soundInfo->ident = ID_NUMBER; - mplayInfo->ident = ID_NUMBER; -} - -void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader) -{ - s32 i; - u8 unk_B; - struct MusicPlayerTrack *track; - - if (mplayInfo->ident != ID_NUMBER) - return; - - unk_B = mplayInfo->unk_B; - - if (!unk_B - || ((!mplayInfo->songHeader || !(mplayInfo->tracks[0].flags & MPT_FLG_START)) - && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0 - || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE))) - || (mplayInfo->priority <= songHeader->priority)) - { - mplayInfo->ident++; - mplayInfo->status = 0; - mplayInfo->songHeader = songHeader; - mplayInfo->tone = songHeader->tone; - mplayInfo->priority = songHeader->priority; - mplayInfo->clock = 0; - mplayInfo->tempoD = 150; - mplayInfo->tempoI = 150; - mplayInfo->tempoU = 0x100; - mplayInfo->tempoC = 0; - mplayInfo->fadeOI = 0; - - i = 0; - track = mplayInfo->tracks; - - while (i < songHeader->trackCount && i < mplayInfo->trackCount) - { - TrackStop(mplayInfo, track); - track->flags = MPT_FLG_EXIST | MPT_FLG_START; - track->chan = 0; - track->cmdPtr = songHeader->part[i]; - i++; - track++; - } - - while (i < mplayInfo->trackCount) - { - TrackStop(mplayInfo, track); - track->flags = 0; - i++; - track++; - } - - if (songHeader->reverb & 0x80) - m4aSoundMode(songHeader->reverb); - - mplayInfo->ident = ID_NUMBER; - } -} - -void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo) -{ - s32 i; - struct MusicPlayerTrack *track; - - if (mplayInfo->ident != ID_NUMBER) - return; - - mplayInfo->ident++; - mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE; - - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - - while (i > 0) - { - TrackStop(mplayInfo, track); - i--; - track++; - } - - mplayInfo->ident = ID_NUMBER; -} - -void FadeOutBody(struct MusicPlayerInfo *mplayInfo) -{ - s32 i; - struct MusicPlayerTrack *track; - u16 fadeOI = mplayInfo->fadeOI; - register u32 temp asm("r3"); - register u16 mask asm("r2"); - - if (fadeOI == 0) - return; - - mplayInfo->fadeOC--; - - temp = 0xFFFF; - mask = temp; - - if (mplayInfo->fadeOC != 0) - return; - - mplayInfo->fadeOC = fadeOI; - - if (mplayInfo->fadeOV & FADE_IN) - { - mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT); - - if ((u16)(mplayInfo->fadeOV & mask) >= (64 << FADE_VOL_SHIFT)) - { - mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT); - mplayInfo->fadeOI = 0; - } - } - else - { - mplayInfo->fadeOV -= (4 << FADE_VOL_SHIFT); - - if ((s16)(mplayInfo->fadeOV & mask) <= 0) - { - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - - while (i > 0) - { - register u32 fadeOV asm("r7"); - u32 val; - - TrackStop(mplayInfo, track); - - val = TEMPORARY_FADE; - fadeOV = mplayInfo->fadeOV; - val &= fadeOV; - - if (!val) - track->flags = 0; - - i--; - track++; - } - - if (mplayInfo->fadeOV & TEMPORARY_FADE) - mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE; - else - mplayInfo->status = MUSICPLAYER_STATUS_PAUSE; - - mplayInfo->fadeOI = 0; - return; - } - } - - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - - while (i > 0) - { - if (track->flags & MPT_FLG_EXIST) - { - track->volX = (mplayInfo->fadeOV >> FADE_VOL_SHIFT); - track->flags |= MPT_FLG_VOLCHG; - } - - i--; - track++; - } -} - -void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - if (track->flags & MPT_FLG_VOLSET) - { - s32 x; - s32 y; - - x = (u32)(track->vol * track->volX) >> 5; - - if (track->modT == 1) - x = (u32)(x * (track->modM + 128)) >> 7; - - y = 2 * track->pan + track->panX; - - if (track->modT == 2) - y += track->modM; - - if (y < -128) - y = -128; - else if (y > 127) - y = 127; - - track->volMR = (u32)((y + 128) * x) >> 8; - track->volML = (u32)((127 - y) * x) >> 8; - } - - if (track->flags & MPT_FLG_PITSET) - { - s32 bend = track->bend * track->bendRange; - register s32 x asm("r1") = track->tune; - x += bend; - x *= 4; - x += (track->keyShift << 8); - x += (track->keyShiftX << 8); - x += track->pitX; - - if (track->modT == 0) - x += 16 * track->modM; - - track->keyM = x >> 8; - track->pitM = x; - } - - track->flags &= ~(MPT_FLG_PITSET | MPT_FLG_VOLSET); -} - -u32 MidiKeyToCgbFreq(u8 chanNum, u8 key, u8 fineAdjust) -{ - if (chanNum == 4) - { - if (key <= 20) - { - key = 0; - } - else - { - key -= 21; - if (key > 59) - key = 59; - } - - return gNoiseTable[key]; - } - else - { - s32 val1; - s32 val2; - - if (key <= 35) - { - fineAdjust = 0; - key = 0; - } - else - { - key -= 36; - if (key > 130) - { - key = 130; - fineAdjust = 255; - } - } - - val1 = gCgbScaleTable[key]; - val1 = gCgbFreqTable[val1 & 0xF] >> (val1 >> 4); - - val2 = gCgbScaleTable[key + 1]; - val2 = gCgbFreqTable[val2 & 0xF] >> (val2 >> 4); - - return val1 + ((fineAdjust * (val2 - val1)) >> 8) + 2048; - } -} - -void CgbOscOff(u8 chanNum) -{ - switch (chanNum) - { - case 1: - REG_NR12 = 8; - REG_NR14 = 0x80; - break; - case 2: - REG_NR22 = 8; - REG_NR24 = 0x80; - break; - case 3: - REG_NR30 = 0; - break; - default: - REG_NR42 = 8; - REG_NR44 = 0x80; - } -} - -static inline int CgbPan(struct CgbChannel *chan) -{ - u32 rightVolume = chan->rightVolume; - u32 leftVolume = chan->leftVolume; - - if ((rightVolume = (u8)rightVolume) >= (leftVolume = (u8)leftVolume)) - { - if (rightVolume / 2 >= leftVolume) - { - chan->pan = 0x0F; - return 1; - } - } - else - { - if (leftVolume / 2 >= rightVolume) - { - chan->pan = 0xF0; - return 1; - } - } - - return 0; -} - -void CgbModVol(struct CgbChannel *chan) -{ - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - - if ((soundInfo->mode & 1) || !CgbPan(chan)) - { - chan->pan = 0xFF; - chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4; - } - else - { - // Force chan->rightVolume and chan->leftVolume to be read from memory again, - // even though there is no reason to do so. - // The command line option "-fno-gcse" achieves the same result as this. - asm("" : : : "memory"); - - chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4; - if (chan->eg > 15) - chan->eg = 15; - } - - chan->sg = (chan->eg * chan->su + 15) >> 4; - chan->pan &= chan->panMask; -} diff --git a/src/m4a_3.c b/src/m4a_3.c deleted file mode 100644 index 77d0087c02..0000000000 --- a/src/m4a_3.c +++ /dev/null @@ -1,324 +0,0 @@ -#include "gba/m4a_internal.h" - -extern const u8 gCgb3Vol[]; - -void CgbSound(void) -{ - s32 ch; - struct CgbChannel *channels; - s32 evAdd; - s32 prevC15; - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - vu8 *nrx0ptr; - vu8 *nrx1ptr; - vu8 *nrx2ptr; - vu8 *nrx3ptr; - vu8 *nrx4ptr; - - // Most comparision operations that cast to s8 perform 'and' by 0xFF. - int xFF = 0xff; - - if (soundInfo->c15) - soundInfo->c15--; - else - soundInfo->c15 = 14; - - for (ch = 1, channels = soundInfo->cgbChans; ch <= 4; ch++, channels++) - { - if (!(channels->sf & 0xc7)) - continue; - - switch (ch) - { - case 1: - nrx0ptr = (vu8 *)(REG_ADDR_NR10); - nrx1ptr = (vu8 *)(REG_ADDR_NR11); - nrx2ptr = (vu8 *)(REG_ADDR_NR12); - nrx3ptr = (vu8 *)(REG_ADDR_NR13); - nrx4ptr = (vu8 *)(REG_ADDR_NR14); - break; - case 2: - nrx0ptr = (vu8 *)(REG_ADDR_NR10+1); - nrx1ptr = (vu8 *)(REG_ADDR_NR21); - nrx2ptr = (vu8 *)(REG_ADDR_NR22); - nrx3ptr = (vu8 *)(REG_ADDR_NR23); - nrx4ptr = (vu8 *)(REG_ADDR_NR24); - break; - case 3: - nrx0ptr = (vu8 *)(REG_ADDR_NR30); - nrx1ptr = (vu8 *)(REG_ADDR_NR31); - nrx2ptr = (vu8 *)(REG_ADDR_NR32); - nrx3ptr = (vu8 *)(REG_ADDR_NR33); - nrx4ptr = (vu8 *)(REG_ADDR_NR34); - break; - default: - nrx0ptr = (vu8 *)(REG_ADDR_NR30+1); - nrx1ptr = (vu8 *)(REG_ADDR_NR41); - nrx2ptr = (vu8 *)(REG_ADDR_NR42); - nrx3ptr = (vu8 *)(REG_ADDR_NR43); - nrx4ptr = (vu8 *)(REG_ADDR_NR44); - break; - } - - prevC15 = soundInfo->c15; - evAdd = *nrx2ptr; - - if (channels->sf & 0x80) - { - if (!(channels->sf & 0x40)) - { - channels->sf = 3; - channels->mo = 3; - CgbModVol(channels); - switch (ch) - { - case 1: - *nrx0ptr = channels->sw; - // fallthrough - case 2: - *nrx1ptr = ((u32)channels->wp << 6) + channels->le; - goto loc_82E0E30; - break; - case 3: - if ((u32)channels->wp != channels->cp) - { - *nrx0ptr = 0x40; - REG_WAVE_RAM0 = channels->wp[0]; - REG_WAVE_RAM1 = channels->wp[1]; - REG_WAVE_RAM2 = channels->wp[2]; - REG_WAVE_RAM3 = channels->wp[3]; - channels->cp = (u32)channels->wp; - } - *nrx0ptr = 0; - *nrx1ptr = channels->le; - if (channels->le) - channels->n4 = -64; - else - channels->n4 = -128; - break; - default: - *nrx1ptr = channels->le; - *nrx3ptr = (u32)channels->wp << 3; - loc_82E0E30: - evAdd = channels->at + 8; - if (channels->le) - channels->n4 = 64; - else - channels->n4 = 0; - break; - } - channels->ec = channels->at; - if ((s8)(channels->at & xFF)) - { - channels->ev = 0; - goto EC_MINUS; - } - else - { - goto loc_82E0F96; - } - } - else - { - goto loc_82E0E82; - } - } - else if (channels->sf & 0x04) - { - channels->echoLength--; - if ((s8)(channels->echoLength & xFF) <= 0) - { - loc_82E0E82: - CgbOscOff(ch); - channels->sf = 0; - goto LAST_LABEL; - } - goto loc_82E0FD6; - } - else if ((channels->sf & 0x40) && (channels->sf & 0x03)) - { - channels->sf &= 0xfc; - channels->ec = channels->re; - if ((s8)(channels->re & xFF)) - { - channels->mo |= 1; - if (ch != 3) - { - evAdd = channels->re; - } - goto EC_MINUS; - } - else - { - goto loc_82E0F02; - } - } - else - { - loc_82E0ED0: - if (channels->ec == 0) - { - if (ch == 3) - { - channels->mo |= 1; - } - CgbModVol(channels); - if ((channels->sf & 0x3) == 0) - { - channels->ev--; - if ((s8)(channels->ev & xFF) <= 0) - { - loc_82E0F02: - channels->ev = ((channels->eg * channels->echoVolume) + 0xFF) >> 8; - if (channels->ev) - { - channels->sf |= 0x4; - channels->mo |= 1; - if (ch != 3) - { - evAdd = 8; - } - goto loc_82E0FD6; - } - else - { - goto loc_82E0E82; - } - } - else - { - channels->ec = channels->re; - } - } - else if ((channels->sf & 0x3) == 1) - { - loc_82E0F3A: - channels->ev = channels->sg; - channels->ec = 7; - } - else if ((channels->sf & 0x3) == 2) - { - int ev, sg; - - channels->ev--; - ev = (s8)(channels->ev & xFF); - sg = (s8)(channels->sg); - if (ev <= sg) - { - loc_82E0F5A: - if (channels->su == 0) - { - channels->sf &= 0xfc; - goto loc_82E0F02; - } - else - { - channels->sf--; - channels->mo |= 1; - if (ch != 3) - { - evAdd = 8; - } - goto loc_82E0F3A; - } - } - else - { - channels->ec = channels->de; - } - } - else - { - channels->ev++; - if ((u8)(channels->ev & xFF) >= channels->eg) - { - loc_82E0F96: - channels->sf--; - channels->ec = channels->de; - if ((u8)(channels->ec & xFF)) - { - channels->mo |= 1; - channels->ev = channels->eg; - if (ch != 3) - { - evAdd = channels->de; - } - } - else - { - goto loc_82E0F5A; - } - } - else - { - channels->ec = channels->at; - } - } - } - } - - EC_MINUS: - channels->ec--; - if (prevC15 == 0) - { - prevC15--; - goto loc_82E0ED0; - } - - loc_82E0FD6: - if (channels->mo & 0x2) - { - if (ch < 4 && (channels->ty & 0x08)) - { - int biasH = REG_SOUNDBIAS_H; - - if (biasH < 64) - { - channels->fr = (channels->fr + 2) & 0x7fc; - } - else if (biasH < 128) - { - channels->fr = (channels->fr + 1) & 0x7fe; - } - } - if (ch != 4) - { - *nrx3ptr = channels->fr; - } - else - { - *nrx3ptr = (*nrx3ptr & 0x08) | channels->fr; - } - channels->n4 = (channels->n4 & 0xC0) + (*((u8*)(&channels->fr) + 1)); - *nrx4ptr = (s8)(channels->n4 & xFF); - } - - if (channels->mo & 1) - { - REG_NR51 = (REG_NR51 & ~channels->panMask) | channels->pan; - if (ch == 3) - { - *nrx2ptr = gCgb3Vol[channels->ev]; - if (channels->n4 & 0x80) - { - *nrx0ptr = 0x80; - *nrx4ptr = channels->n4; - channels->n4 &= 0x7f; - } - } - else - { - evAdd &= 0xf; - *nrx2ptr = (channels->ev << 4) + evAdd; - *nrx4ptr = channels->n4 | 0x80; - if (ch == 1 && !(*nrx0ptr & 0x08)) - { - *nrx4ptr = channels->n4 | 0x80; - } - } - } - - LAST_LABEL: - channels->mo = 0; - } -} diff --git a/src/m4a_4.c b/src/m4a_4.c deleted file mode 100644 index e645fbef5f..0000000000 --- a/src/m4a_4.c +++ /dev/null @@ -1,545 +0,0 @@ -#include "gba/m4a_internal.h" - -void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo) -{ - if (mplayInfo->ident == ID_NUMBER) - { - mplayInfo->ident++; - mplayInfo->tempoU = tempo; - mplayInfo->tempoI = (mplayInfo->tempoD * mplayInfo->tempoU) >> 8; - mplayInfo->ident = ID_NUMBER; - } -} - -void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume) -{ - s32 i; - u32 bit; - struct MusicPlayerTrack *track; - - if (mplayInfo->ident != ID_NUMBER) - return; - - mplayInfo->ident++; - - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - bit = 1; - - while (i > 0) - { - if (trackBits & bit) - { - if (track->flags & MPT_FLG_EXIST) - { - track->volX = volume / 4; - track->flags |= MPT_FLG_VOLCHG; - } - } - - i--; - track++; - bit <<= 1; - } - - mplayInfo->ident = ID_NUMBER; -} - -void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch) -{ - s32 i; - u32 bit; - struct MusicPlayerTrack *track; - - if (mplayInfo->ident != ID_NUMBER) - return; - - mplayInfo->ident++; - - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - bit = 1; - - while (i > 0) - { - if (trackBits & bit) - { - if (track->flags & MPT_FLG_EXIST) - { - track->keyShiftX = pitch >> 8; - track->pitX = pitch; - track->flags |= MPT_FLG_PITCHG; - } - } - - i--; - track++; - bit <<= 1; - } - - mplayInfo->ident = ID_NUMBER; -} - -void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan) -{ - s32 i; - u32 bit; - struct MusicPlayerTrack *track; - - if (mplayInfo->ident != ID_NUMBER) - return; - - mplayInfo->ident++; - - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - bit = 1; - - while (i > 0) - { - if (trackBits & bit) - { - if (track->flags & MPT_FLG_EXIST) - { - track->panX = pan; - track->flags |= MPT_FLG_VOLCHG; - } - } - - i--; - track++; - bit <<= 1; - } - - mplayInfo->ident = ID_NUMBER; -} - -void ClearModM(struct MusicPlayerTrack *track) -{ - track->lfoSpeedC = 0; - track->modM = 0; - - if (track->modT == 0) - track->flags |= MPT_FLG_PITCHG; - else - track->flags |= MPT_FLG_VOLCHG; -} - -void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth) -{ - s32 i; - u32 bit; - struct MusicPlayerTrack *track; - - if (mplayInfo->ident != ID_NUMBER) - return; - - mplayInfo->ident++; - - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - bit = 1; - - while (i > 0) - { - if (trackBits & bit) - { - if (track->flags & MPT_FLG_EXIST) - { - track->mod = modDepth; - - if (!track->mod) - ClearModM(track); - } - } - - i--; - track++; - bit <<= 1; - } - - mplayInfo->ident = ID_NUMBER; -} - -void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed) -{ - s32 i; - u32 bit; - struct MusicPlayerTrack *track; - - if (mplayInfo->ident != ID_NUMBER) - return; - - mplayInfo->ident++; - - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - bit = 1; - - while (i > 0) - { - if (trackBits & bit) - { - if (track->flags & MPT_FLG_EXIST) - { - track->lfoSpeed = lfoSpeed; - - if (!track->lfoSpeed) - ClearModM(track); - } - } - - i--; - track++; - bit <<= 1; - } - - mplayInfo->ident = ID_NUMBER; -} - -#define MEMACC_COND_JUMP(cond) \ -if (cond) \ - goto cond_true; \ -else \ - goto cond_false; \ - -void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - u32 op; - u8 *addr; - u8 data; - - op = *track->cmdPtr; - track->cmdPtr++; - - addr = mplayInfo->memAccArea + *track->cmdPtr; - track->cmdPtr++; - - data = *track->cmdPtr; - track->cmdPtr++; - - switch (op) - { - case 0: - *addr = data; - return; - case 1: - *addr += data; - return; - case 2: - *addr -= data; - return; - case 3: - *addr = mplayInfo->memAccArea[data]; - return; - case 4: - *addr += mplayInfo->memAccArea[data]; - return; - case 5: - *addr -= mplayInfo->memAccArea[data]; - return; - case 6: - MEMACC_COND_JUMP(*addr == data) - return; - case 7: - MEMACC_COND_JUMP(*addr != data) - return; - case 8: - MEMACC_COND_JUMP(*addr > data) - return; - case 9: - MEMACC_COND_JUMP(*addr >= data) - return; - case 10: - MEMACC_COND_JUMP(*addr <= data) - return; - case 11: - MEMACC_COND_JUMP(*addr < data) - return; - case 12: - MEMACC_COND_JUMP(*addr == mplayInfo->memAccArea[data]) - return; - case 13: - MEMACC_COND_JUMP(*addr != mplayInfo->memAccArea[data]) - return; - case 14: - MEMACC_COND_JUMP(*addr > mplayInfo->memAccArea[data]) - return; - case 15: - MEMACC_COND_JUMP(*addr >= mplayInfo->memAccArea[data]) - return; - case 16: - MEMACC_COND_JUMP(*addr <= mplayInfo->memAccArea[data]) - return; - case 17: - MEMACC_COND_JUMP(*addr < mplayInfo->memAccArea[data]) - return; - default: - return; - } - -cond_true: - { - void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[1]); - func(mplayInfo, track); - return; - } - -cond_false: - track->cmdPtr += 4; -} - -void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - u32 n = *track->cmdPtr; - track->cmdPtr++; - - gXcmdTable[n](mplayInfo, track); -} - -void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[0]); - func(mplayInfo, track); -} - -#define READ_XCMD_BYTE(var, n) \ -{ \ - u32 byte = track->cmdPtr[(n)]; \ - byte <<= n * 8; \ - (var) &= ~(0xFF << (n * 8)); \ - (var) |= byte; \ -} - -void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - u32 wav; - - READ_XCMD_BYTE(wav, 0) // UB: uninitialized variable - READ_XCMD_BYTE(wav, 1) - READ_XCMD_BYTE(wav, 2) - READ_XCMD_BYTE(wav, 3) - - track->tone.wav = (struct WaveData *)wav; - track->cmdPtr += 4; -} - -void ply_xtype(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->tone.type = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xatta(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->tone.attack = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xdeca(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->tone.decay = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xsust(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->tone.sustain = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xrele(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->tone.release = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xiecv(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->echoVolume = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xiecl(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->echoLength = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xleng(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->tone.length = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xswee(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - track->tone.pan_sweep = *track->cmdPtr; - track->cmdPtr++; -} - -void ply_xcmd_0C(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - u32 unk; - - READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable - READ_XCMD_BYTE(unk, 1) - - if (track->unk_3A < (u16)unk) - { - track->unk_3A++; - track->cmdPtr -= 2; - track->wait = 1; - } - else - { - track->unk_3A = 0; - track->cmdPtr += 2; - } -} - -void ply_xcmd_0D(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) -{ - u32 unk; - - READ_XCMD_BYTE(unk, 0) // UB: uninitialized variable - READ_XCMD_BYTE(unk, 1) - READ_XCMD_BYTE(unk, 2) - READ_XCMD_BYTE(unk, 3) - - track->unk_3C = unk; - track->cmdPtr += 4; -} - -void DummyFunc(void) -{ -} - -struct MusicPlayerInfo *SetPokemonCryTone(struct ToneData *tone) -{ - u32 maxClock = 0; - s32 maxClockIndex = 0; - s32 i; - struct MusicPlayerInfo *mplayInfo; - - for (i = 0; i < MAX_POKEMON_CRIES; i++) - { - struct MusicPlayerTrack *track = &gPokemonCryTracks[i * 2]; - - if (!track->flags && (!track->chan || track->chan->track != track)) - goto start_song; - - if (maxClock < gPokemonCryMusicPlayers[i].clock) - { - maxClock = gPokemonCryMusicPlayers[i].clock; - maxClockIndex = i; - } - } - - i = maxClockIndex; - -start_song: - mplayInfo = &gPokemonCryMusicPlayers[i]; - mplayInfo->ident++; - -#define CRY ((s32)&gPokemonCrySongs + i * sizeof(struct PokemonCrySong)) -#define CRY_OFS(field) offsetof(struct PokemonCrySong, field) - - memcpy((void *)CRY, &gPokemonCrySong, sizeof(struct PokemonCrySong)); - - *(u32 *)(CRY + CRY_OFS(tone)) = (u32)tone; - *(u32 *)(CRY + CRY_OFS(part)) = CRY + CRY_OFS(part0); - *(u32 *)(CRY + CRY_OFS(part) + 4) = CRY + CRY_OFS(part1); - *(u32 *)(CRY + CRY_OFS(gotoTarget)) = CRY + CRY_OFS(cont); - -#undef CRY_OFS -#undef CRY - - mplayInfo->ident = ID_NUMBER; - - MPlayStart(mplayInfo, (struct SongHeader *)(&gPokemonCrySongs[i])); - - return mplayInfo; -} - -void SetPokemonCryVolume(u8 val) -{ - gPokemonCrySong.volumeValue = val & 0x7F; -} - -void SetPokemonCryPanpot(s8 val) -{ - gPokemonCrySong.panValue = (val + C_V) & 0x7F; -} - -void SetPokemonCryPitch(s16 val) -{ - s16 b = val + 0x80; - u8 a = gPokemonCrySong.tuneValue2 - gPokemonCrySong.tuneValue; - gPokemonCrySong.tieKeyValue = (b >> 8) & 0x7F; - gPokemonCrySong.tuneValue = (b >> 1) & 0x7F; - gPokemonCrySong.tuneValue2 = (a + ((b >> 1) & 0x7F)) & 0x7F; -} - -void SetPokemonCryLength(u16 val) -{ - gPokemonCrySong.unkCmd0CParam = val; -} - -void SetPokemonCryRelease(u8 val) -{ - gPokemonCrySong.releaseValue = val; -} - -void SetPokemonCryProgress(u32 val) -{ - gPokemonCrySong.unkCmd0DParam = val; -} - -int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo) -{ - struct MusicPlayerTrack *track = mplayInfo->tracks; - - if (track->chan && track->chan->track == track) - return 1; - else - return 0; -} - -void SetPokemonCryChorus(s8 val) -{ - if (val) - { - gPokemonCrySong.trackCount = 2; - gPokemonCrySong.tuneValue2 = (val + gPokemonCrySong.tuneValue) & 0x7F; - } - else - { - gPokemonCrySong.trackCount = 1; - } -} - -void SetPokemonCryStereo(u32 val) -{ - struct SoundInfo *soundInfo = SOUND_INFO_PTR; - - if (val) - { - REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT - | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT - | SOUND_ALL_MIX_FULL; - soundInfo->mode &= ~1; - } - else - { - REG_SOUNDCNT_H = SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT | SOUND_B_RIGHT_OUTPUT - | SOUND_A_TIMER_0 | SOUND_A_LEFT_OUTPUT | SOUND_A_RIGHT_OUTPUT - | SOUND_B_MIX_HALF | SOUND_A_MIX_HALF | SOUND_CGB_MIX_FULL; - soundInfo->mode |= 1; - } -} - -void SetPokemonCryPriority(u8 val) -{ - gPokemonCrySong.priority = val; -} diff --git a/sym_common.txt b/sym_common.txt index 3a7d698fd5..7ec936a934 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -91,7 +91,7 @@ gUnknown_03006328: @ 3006328 gUnknown_03006370: @ 3006370 .space 0x10 - .include "m4a_2.o" + .include "m4a.o" .include "agb_flash.o" gRfuState: @ 3007868 From 26b371e080014e26707c6506de20a05ebac1ed5b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 10:37:50 +0100 Subject: [PATCH 25/42] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6851c8c907..091cba61f0 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR) ASFLAGS := -mcpu=arm7tdmi CC1 := tools/agbcc/bin/agbcc$(EXE) -override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -Os -fhex-asm +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include From 5dfaf22fb37104fb21a740b77fb353263fc178ca Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 11:39:24 +0100 Subject: [PATCH 26/42] Fix pokemon icon asm --- src/pokemon_icon.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index bcbb60e213..ecb8f4950f 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1238,7 +1238,6 @@ const u16* GetValidMonIconPalettePtr(u16 species) return gMonIconPaletteTable[gMonIconPaletteIndices[species]].data; } -// TODO: try to find a way to avoid using asm statement u8 UpdateMonIconFrame(struct Sprite *sprite) { u8 result = 0; @@ -1262,10 +1261,7 @@ u8 UpdateMonIconFrame(struct Sprite *sprite) (u8 *)sprite->images + (sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame), (u8 *)(OBJ_VRAM0 + sprite->oam.tileNum * TILE_SIZE_4BPP), sSpriteImageSizes[sprite->oam.shape][sprite->oam.size]); - { - register u8 duration asm("r0") = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; - sprite->animDelayCounter = duration; - } + sprite->animDelayCounter = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration & 0xFF; sprite->animCmdIndex++; result = sprite->animCmdIndex; break; From 7c8fb66acf964ba4cf6b5dd5af16b70b596c477b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 11:50:45 +0100 Subject: [PATCH 27/42] Fix field player avatar fakmatch --- src/field_player_avatar.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 7423216a48..b1291f0ce1 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -90,7 +90,7 @@ static bool8 sub_808B618(void); static bool8 PlayerIsAnimActive(void); static bool8 PlayerCheckIfAnimFinishedOrInactive(void); -static void PlayerRun(u8); +static void PlayerRun(u8); static void PlayerNotOnBikeCollide(u8); static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8); @@ -343,7 +343,7 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO u8 r5 = direction; register u8 r6 asm("r6") = direction; #endif - //a very bad HACK + //a very bad HACK if (EventObjectIsMovementOverridden(playerEventObj) && !EventObjectClearHeldMovementIfFinished(playerEventObj)) @@ -821,24 +821,14 @@ void SetPlayerAvatarTransitionFlags(u16 transitionFlags) static void DoPlayerAvatarTransition(void) { u8 i; - u32 flags = gPlayerAvatar.unk1; + u8 flags = gPlayerAvatar.unk1; if (flags != 0) { for (i = 0; i < 8; i++, flags >>= 1) { -#ifdef NONMATCHING if (flags & 1) - { gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]); - } -#else - if (flags & 1) - { - register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_084974B8; - funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]); - } -#endif } gPlayerAvatar.unk1 = 0; } @@ -1151,7 +1141,7 @@ void PlayerGetDestCoords(s16 *x, s16 *y) u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) { struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; - + if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2]) { *x = object->currentCoords.x; @@ -1765,7 +1755,7 @@ static bool8 Fishing2(struct Task *task) static bool8 Fishing3(struct Task *task) { AlignFishingAnimationFrames(); - + // Wait one second task->tFrameCounter++; if (task->tFrameCounter >= 60) From e3bec4b4809201d5007f0ae8e9e997235344ee03 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 11:56:02 +0100 Subject: [PATCH 28/42] fix nonmatch in mauville old man --- src/mauville_old_man.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 930f1f35b0..1b4a252179 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -572,9 +572,6 @@ static void Task_BardSong(u8 taskId) struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; u8 *str = gStringVar4 + task->tCharIndex; u16 wordLen = 0; - // Can't get it to match without hacking - u32 temp; - register s16 zero asm("r1"); while (*str != CHAR_SPACE && *str != CHAR_NEWLINE @@ -588,17 +585,22 @@ static void Task_BardSong(u8 taskId) sUnknownBardRelated = MACRO2(bard->songLyrics[task->tCurrWord]); else sUnknownBardRelated = MACRO2(bard->temporaryLyrics[task->tCurrWord]); - temp = gBardSong.length / wordLen; - zero = 0; - gBardSong.length = temp; + + gBardSong.length /= wordLen; if (gBardSong.length <= 0) gBardSong.length = 1; task->tCurrWord++; + if (task->data[2] == 0) + { task->tState = 3; + task->data[1] = 0; + } else + { task->tState = 5; - task->data[1] = zero; + task->data[1] = 0; + } } break; case 5: From c0db31163732e976ebe64d0d65da309847986367 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 12:26:40 +0100 Subject: [PATCH 29/42] some more fakematch fix --- src/ice.c | 303 +++++++++++++++++++++++++------------------------- src/palette.c | 6 +- 2 files changed, 155 insertions(+), 154 deletions(-) diff --git a/src/ice.c b/src/ice.c index 77b3700ef0..d354fce7e1 100644 --- a/src/ice.c +++ b/src/ice.c @@ -530,7 +530,7 @@ static void sub_810B6C4(struct Sprite *sprite) { s16 targetX, targetY, attackerX, attackerY; s16 i; - + sprite->oam.tileNum += 7; targetX = GetBattlerSpriteCoord(gBattleAnimTarget, 2); targetY = GetBattlerSpriteCoord(gBattleAnimTarget, 3); @@ -811,7 +811,7 @@ void AnimIceBeamParticle(struct Sprite *sprite) sprite->callback = StartAnimLinearTranslation; } -// Animates the ice crystals at the end of Ice Punch, Ice Beam, Tri Attack, +// Animates the ice crystals at the end of Ice Punch, Ice Beam, Tri Attack, // Weather Ball (Hail), Blizzard, and Powder Snow. // arg 0: target x offset // arg 1: target y offset @@ -917,7 +917,7 @@ void AnimSwirlingSnowball_Step2(struct Sprite *sprite) sprite->pos2.x = 0; sprite->data[0] = 128; - tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : -20; + tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20; sprite->data[3] = Sin(sprite->data[0], tempVar); sprite->data[4] = Cos(sprite->data[0], 0xF); @@ -1069,7 +1069,7 @@ void AnimWaveFromCenterOfTarget(struct Sprite *sprite) sprite->pos1.y += gBattleAnimArgs[1]; } - sprite->data[0]++; + sprite->data[0]++; } else { @@ -1099,9 +1099,9 @@ void InitSwirlingFogAnim(struct Sprite *sprite) else { SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos1.x -= gBattleAnimArgs[0]; - else + else sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -1109,18 +1109,18 @@ void InitSwirlingFogAnim(struct Sprite *sprite) battler = gBattleAnimAttacker; } - else + else { if (gBattleAnimArgs[5] == 0) { InitSpritePosToAnimTarget(sprite, FALSE); } - else + else { SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) sprite->pos1.x -= gBattleAnimArgs[0]; - else + else sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -1130,7 +1130,7 @@ void InitSwirlingFogAnim(struct Sprite *sprite) } sprite->data[7] = battler; - if (gBattleAnimArgs[5] == 0 || !IsDoubleBattle()) + if (gBattleAnimArgs[5] == 0 || !IsDoubleBattle()) tempVar = 0x20; else tempVar = 0x40; @@ -1161,7 +1161,7 @@ void AnimSwirlingFogAnim(struct Sprite *sprite) sprite->pos2.y += Cos(sprite->data[5], -6); if ((u16)(sprite->data[5] - 64) <= 0x7F) - sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]); + sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]); else sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]) + 1; @@ -1195,7 +1195,7 @@ void AnimTask_Haze1(u8 taskId) LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset); sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0); LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32); - + gTasks[taskId].func = AnimTask_Haze2; } @@ -1208,62 +1208,63 @@ void AnimTask_Haze2(u8 taskId) switch (gTasks[taskId].data[12]) { - case 0: - if (++gTasks[taskId].data[10] == 4) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[9]++; - gTasks[taskId].data[11] = gUnknown_08595C5C[gTasks[taskId].data[9]]; + case 0: + if (++gTasks[taskId].data[10] == 4) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[9]++; + gTasks[taskId].data[11] = gUnknown_08595C5C[gTasks[taskId].data[9]]; - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11])); - if (gTasks[taskId].data[11] == 9) - { - gTasks[taskId].data[12]++; - gTasks[taskId].data[11] = 0; - } - } - break; - case 1: - if (++gTasks[taskId].data[11] == 0x51) + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11])); + if (gTasks[taskId].data[11] == 9) { - gTasks[taskId].data[11] = 9; gTasks[taskId].data[12]++; + gTasks[taskId].data[11] = 0; } - break; - case 2: - if (++gTasks[taskId].data[10] == 4) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[11]--; - - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11])); - if (gTasks[taskId].data[11] == 0) - { - gTasks[taskId].data[12]++; - gTasks[taskId].data[11] = 0; - } - } - break; - case 3: - sub_80A6B30(&subStruct); - sub_80A6C68(1); - sub_80A6C68(2); - + } + break; + case 1: + if (++gTasks[taskId].data[11] == 0x51) + { + gTasks[taskId].data[11] = 9; gTasks[taskId].data[12]++; - - // fall through - case 4: - if (!IsContest()) - SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); + } + break; + case 2: + if (++gTasks[taskId].data[10] == 4) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[11]--; - gBattle_BG1_X = 0; - gBattle_BG1_Y = 0; - SetGpuReg(REG_OFFSET_BLDCNT, 0); - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0)); - SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); - DestroyAnimVisualTask(taskId); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11])); + if (gTasks[taskId].data[11] == 0) + { + gTasks[taskId].data[12]++; + gTasks[taskId].data[11] = 0; + } + } + break; + case 3: + sub_80A6B30(&subStruct); + sub_80A6C68(1); + sub_80A6C68(2); + + gTasks[taskId].data[12]++; + + // fall through + case 4: + if (!IsContest()) + SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); + + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0)); + SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); + DestroyAnimVisualTask(taskId); + break; } -} +} // Throws the ball in Mist Ball. // arg 0: initial x pixel offset @@ -1301,7 +1302,7 @@ void AnimTask_LoadMistTiles(u8 taskId) LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset); sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0); LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32); - + gTasks[taskId].data[15] = -1; gTasks[taskId].func = AnimTask_OverlayFogTiles; } @@ -1315,54 +1316,55 @@ void AnimTask_OverlayFogTiles(u8 taskId) switch (gTasks[taskId].data[12]) { - case 0: - gTasks[taskId].data[9] += 1; - gTasks[taskId].data[11] = gUnknown_08595C88[gTasks[taskId].data[9]]; - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 17 - gTasks[taskId].data[11])); - if (gTasks[taskId].data[11] == 5) + case 0: + gTasks[taskId].data[9] += 1; + gTasks[taskId].data[11] = gUnknown_08595C88[gTasks[taskId].data[9]]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 17 - gTasks[taskId].data[11])); + if (gTasks[taskId].data[11] == 5) + { + gTasks[taskId].data[12]++; + gTasks[taskId].data[11] = 0; + } + break; + case 1: + if (++gTasks[taskId].data[11] == 0x51) + { + gTasks[taskId].data[11] = 5; + gTasks[taskId].data[12]++; + } + break; + case 2: + if (++gTasks[taskId].data[10] == 4) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[11] -= 1; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11])); + if (gTasks[taskId].data[11] == 0) { gTasks[taskId].data[12]++; gTasks[taskId].data[11] = 0; } - break; - case 1: - if (++gTasks[taskId].data[11] == 0x51) - { - gTasks[taskId].data[11] = 5; - gTasks[taskId].data[12]++; - } - break; - case 2: - if (++gTasks[taskId].data[10] == 4) - { - gTasks[taskId].data[10] = 0; - gTasks[taskId].data[11] -= 1; - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11])); - if (gTasks[taskId].data[11] == 0) - { - gTasks[taskId].data[12]++; - gTasks[taskId].data[11] = 0; - } - } - break; - case 3: - sub_80A6B30(&subStruct); - sub_80A6C68(1); - sub_80A6C68(2); - - gTasks[taskId].data[12]++; - - // fall through - case 4: - if (!IsContest()) - SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); + } + break; + case 3: + sub_80A6B30(&subStruct); + sub_80A6C68(1); + sub_80A6C68(2); - gBattle_BG1_X = 0; - gBattle_BG1_Y = 0; - SetGpuReg(REG_OFFSET_BLDCNT, 0); - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0)); - SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); - DestroyAnimVisualTask(taskId); + gTasks[taskId].data[12]++; + + // fall through + case 4: + if (!IsContest()) + SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); + + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0)); + SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); + DestroyAnimVisualTask(taskId); + break; } } @@ -1390,7 +1392,7 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite) if ((sprite->data[7] & 0x8000) && !(gBattlerPositions[gBattleAnimAttacker] & 1)) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1; - sprite->data[6] = 1; + sprite->data[6] = 1; } sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); @@ -1410,7 +1412,7 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[4]; sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8; - } + } if (IsContest()) { @@ -1425,8 +1427,6 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite) void MovePoisonGasCloud(struct Sprite *sprite) { int value; - register s16 value2 asm("r5"); - int unused; switch (sprite->data[7] & 0xFF) { @@ -1441,8 +1441,7 @@ void MovePoisonGasCloud(struct Sprite *sprite) if (sprite->data[0] <= 0) { - value2 = 80; - sprite->data[0] = value2; + sprite->data[0] = 80; sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; @@ -1450,10 +1449,12 @@ void MovePoisonGasCloud(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = sprite->pos1.y + 29; sprite->data[7]++; - if (!IsContest() && gBattlerPositions[gBattleAnimTarget] & 1) + if (IsContest()) + sprite->data[5] = 80; + else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER) sprite->data[5] = 204; else - sprite->data[5] = value2; + sprite->data[5] = 80; sprite->pos2.y = 0; value = gSineTable[sprite->data[5]]; @@ -1490,13 +1491,13 @@ void MovePoisonGasCloud(struct Sprite *sprite) if (sprite->data[0] <= 0) { - asm("mov r5, #0"); // unused local variable? - unused = 0; sprite->data[0] = 0x300; sprite->data[1] = sprite->pos1.x += sprite->pos2.x; sprite->data[3] = sprite->pos1.y += sprite->pos2.y; sprite->data[4] = sprite->pos1.y + 4; - if (!IsContest() && gBattlerPositions[gBattleAnimTarget] & 1) + if (IsContest()) + sprite->data[2] = -0x10; + else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER) sprite->data[2] = 0x100; else sprite->data[2] = -0x10; @@ -1535,43 +1536,43 @@ void AnimTask_Hail2(u8 taskId) struct Task *task = &gTasks[taskId]; switch (task->data[0]) { - case 0: - if (++task->data[4] > 2) - { - task->data[4] = 0; - task->data[5] = 0; - task->data[2] = 0; - task->data[0]++; - } - break; - case 1: - if (task->data[5] == 0) - { - if (GenerateHailParticle(task->data[3], task->data[2], taskId, 1)) - task->data[1]++; - - if (++task->data[2] == 3) - { - if (++task->data[3] == 10) - task->data[0]++; - else - task->data[0]--; - } - else - { - task->data[5] = 1; - } + case 0: + if (++task->data[4] > 2) + { + task->data[4] = 0; + task->data[5] = 0; + task->data[2] = 0; + task->data[0]++; + } + break; + case 1: + if (task->data[5] == 0) + { + if (GenerateHailParticle(task->data[3], task->data[2], taskId, 1)) + task->data[1]++; + if (++task->data[2] == 3) + { + if (++task->data[3] == 10) + task->data[0]++; + else + task->data[0]--; } else { - task->data[5]--; + task->data[5] = 1; } - break; - case 2: - if (task->data[1] == 0) - DestroyAnimVisualTask(taskId); - break; + + } + else + { + task->data[5]--; + } + break; + case 2: + if (task->data[1] == 0) + DestroyAnimVisualTask(taskId); + break; } } @@ -1587,7 +1588,7 @@ bool8 GenerateHailParticle(u8 a, u8 b, u8 taskId, u8 c) u8 spriteId; // struct Sprite *sprite; s16 spriteX; - + if (unk != 2) { battler = GetBattlerAtPosition(hailData->unk2); @@ -1820,7 +1821,7 @@ void AnimHailBegin(struct Sprite *sprite) if (sprite->data[0] == 1 && sprite->data[5] == 0) { - spriteId = CreateSprite(&gUnknown_08595B68, + spriteId = CreateSprite(&gUnknown_08595B68, sprite->data[3], sprite->data[4], sprite->subpriority); sprite->data[0] = spriteId; @@ -1935,6 +1936,6 @@ void AnimTask_GetRolloutCounter(u8 taskId) { u8 arg = gBattleAnimArgs[0]; - gBattleAnimArgs[arg] = gAnimDisableStructPtr->rolloutTimerStartValue - gAnimDisableStructPtr->rolloutTimer - 1; + gBattleAnimArgs[arg] = gAnimDisableStructPtr->rolloutTimerStartValue - gAnimDisableStructPtr->rolloutTimer - 1; DestroyAnimVisualTask(taskId); } diff --git a/src/palette.c b/src/palette.c index deb07b066f..be51438768 100644 --- a/src/palette.c +++ b/src/palette.c @@ -154,7 +154,7 @@ void ReadPlttIntoBuffers(void) bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, u16 blendColor) { u8 temp; - register u32 _blendColor asm("r8") = blendColor; + u16 color = blendColor; if (gPaletteFade.active) { @@ -175,7 +175,7 @@ bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targe gPaletteFade_delay = delay; gPaletteFade.y = startY; gPaletteFade.targetY = targetY; - gPaletteFade.blendColor = _blendColor; + gPaletteFade.blendColor = color; gPaletteFade.active = 1; gPaletteFade.mode = NORMAL_FADE; @@ -881,7 +881,7 @@ void TintPalette_SepiaTone(u16 *palette, u16 count) { s32 r, g, b, i; u32 gray; - + for (i = 0; i < count; i++) { r = (*palette >> 0) & 0x1F; From d02a788d2e930b6f82c92d9e2f885a91922e8cb8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 19:25:10 +0100 Subject: [PATCH 30/42] Match GetItemEffectType --- src/party_menu.c | 223 ++++++++++++++++------------------------------- 1 file changed, 77 insertions(+), 146 deletions(-) diff --git a/src/party_menu.c b/src/party_menu.c index a8c98faecd..8193fcf31a 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2087,7 +2087,8 @@ static bool8 RenderPartyMenuBoxes(void) RenderPartyMenuBox(gUnknown_0203CEC4->data[0]); if (++gUnknown_0203CEC4->data[0] == 6) return TRUE; - return FALSE; + else + return FALSE; } static u8* GetPartyMiscGraphicsTile(u16 tileId) @@ -2130,7 +2131,8 @@ static bool8 party_menu_add_per_mon_objects(void) party_menu_add_per_mon_objects_internal(gUnknown_0203CEC4->data[0]); if (++gUnknown_0203CEC4->data[0] == 6) return TRUE; - return FALSE; + else + return FALSE; } static void sub_81B0F28(void) @@ -2202,6 +2204,7 @@ void sub_81B0FCC(u8 slot, u8 b) static u8 GetPartyBoxPalBitfield(u8 slot, u8 b) { u8 returnVar = 0; + if (b == 1) returnVar |= 1; if (GetMonData(&gPlayerParty[slot], MON_DATA_HP) == 0) @@ -2321,7 +2324,8 @@ static s8* sub_81B13EC(void) { if (gUnknown_0203CEC8.unkB == 8 || gUnknown_0203CEC8.unkB == 10) return &gUnknown_0203CEC8.unkA; - return &gUnknown_0203CEC8.unk9; + else + return &gUnknown_0203CEC8.unk9; } static void sub_81B140C(u8 taskId, s8 *ptr) @@ -2836,7 +2840,7 @@ static void sub_81B1DB8(struct Pokemon *mon, u16 item) SetMonData(mon, MON_DATA_HELD_ITEM, itemBytes); } -static u8 sub_81B1E00(struct Pokemon* mon) +static u8 TryTakeMonItem(struct Pokemon* mon) { u16 item = GetMonData(mon, MON_DATA_HELD_ITEM); @@ -4265,7 +4269,7 @@ static void CursorCb_TakeItem(u8 taskId) PlaySE(SE_SELECT); sub_81B302C(&gUnknown_0203CEC4->unkC[0]); sub_81B302C(&gUnknown_0203CEC4->unkC[1]); - switch (sub_81B1E00(mon)) + switch (TryTakeMonItem(mon)) { case 0: GetMonNickname(mon, gStringVar1); @@ -5203,7 +5207,7 @@ void sub_81B617C(void) bool8 inBattle; u8 i; u8 msgIdMaybe; - register TaskFunc task asm("r0"); + TaskFunc task; if (gMain.inBattle) { @@ -5215,6 +5219,7 @@ void sub_81B617C(void) inBattle = FALSE; doubleBattleStatus = 0; } + if (GetItemEffectType(gSpecialVar_ItemId) == 10) { gUnknown_0203CEC8.unk9 = 0; @@ -5231,9 +5236,14 @@ void sub_81B617C(void) } else { - msgIdMaybe = (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_TM_HM) ? 4 : 5; + if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_TM_HM) + msgIdMaybe = 4; + else + msgIdMaybe = 5; + task = sub_81B1370; } + InitPartyMenu(inBattle, doubleBattleStatus, 3, 1, msgIdMaybe, task, callback); } @@ -5263,9 +5273,11 @@ static bool8 IsHPRecoveryItem(u16 item) effect = gSaveBlock1Ptr->enigmaBerry.itemEffect; else effect = gItemEffectTable[item - ITEM_POTION]; + if ((effect[4] & 4) != 0) return TRUE; - return FALSE; + else + return FALSE; } static void GetMedicineItemEffectMessage(u16 item) @@ -5575,6 +5587,7 @@ void dp05_ether(u8 taskId, TaskFunc task) effect = gSaveBlock1Ptr->enigmaBerry.itemEffect; else effect = gItemEffectTable[item - ITEM_POTION]; + if ((effect[4] & 0x10) == 0) { gUnknown_0203CEC8.unkE = 0; @@ -6196,151 +6209,69 @@ void sub_81B7C74(u8 taskId, TaskFunc task) u8 GetItemEffectType(u16 item) { const u8 *itemEffect; -#ifndef NONMATCHING - register u8 itemEffect0 asm("r1"); - register u8 itemEffect3 asm("r3"); - register u32 itemEffect0_r0 asm("r0"); // u32 to prevent shifting when transferring itemEffect0 to this - u8 mask; -#else -#define itemEffect0 itemEffect[0] -#define itemEffect3 itemEffect[3] -#define mask 0x3F -#endif + u32 statusCure; if (!IS_POKEMON_ITEM(item)) - { return 22; - } + + // Read the item's effect properties. + if (item == ITEM_ENIGMA_BERRY) + itemEffect = gSaveBlock1Ptr->enigmaBerry.itemEffect; else + itemEffect = gItemEffectTable[item - ITEM_POTION]; + + if ((itemEffect[0] & 0x3F) || itemEffect[1] || itemEffect[2] || (itemEffect[3] & 0x80)) + return 0; + else if (itemEffect[0] & 0x40) + return 10; + else if (itemEffect[3] & 0x40) + return 1; + + statusCure = itemEffect[3] & 0x3F; + if (statusCure || (itemEffect[0] >> 7)) { - // Read the item's effect properties. - if (item == ITEM_ENIGMA_BERRY) - { - itemEffect = gSaveBlock1Ptr->enigmaBerry.itemEffect; - } + if (statusCure == 0x20) + return 4; + else if (statusCure == 0x10) + return 3; + else if (statusCure == 0x8) + return 5; + else if (statusCure == 0x4) + return 6; + else if (statusCure == 0x2) + return 7; + else if (statusCure == 0x1) + return 8; + else if (itemEffect[0] >> 7 && !statusCure) + return 9; else - { - itemEffect = gItemEffectTable[item - ITEM_POTION]; - } - -#ifndef NONMATCHING - itemEffect0 = itemEffect[0]; - mask = 0x3F; -#endif - - if ((itemEffect0 & mask) || itemEffect[1] || itemEffect[2]) - { - return 0; - } -#ifndef NONMATCHING - itemEffect3 = itemEffect[3]; -#endif - if (itemEffect3 & 0x80) - { - return 0; - } - else if (itemEffect0 & 0x40) - { - return 10; - } - else if (itemEffect3 & 0x40) - { - return 1; - } - else if ((itemEffect3 & mask) || (itemEffect0 >> 7)) - { - if ((itemEffect3 & mask) == 0x20) - { - return 4; - } - else if ((itemEffect3 & mask) == 0x10) - { - return 3; - } - else if ((itemEffect3 & mask) == 0x8) - { - return 5; - } - else if ((itemEffect3 & mask) == 0x4) - { - return 6; - } - else if ((itemEffect3 & mask) == 0x2) - { - return 7; - } - else if ((itemEffect3 & mask) == 0x1) - { - return 8; - } - // alternate fakematching - // itemEffect0_r0 = itemEffect0 >> 7; - // asm(""); // increase live length for greg - // if ((itemEffect0_r0 != 0) && (itemEffect3 & mask) == 0) -#ifndef NONMATCHING - else if (((itemEffect0_r0 = itemEffect0 >> 7) != 0) && (itemEffect3 & mask) == 0) -#else - else if (((itemEffect[0] >> 7) != 0) && (itemEffect[3] & 0x3F) == 0) -#endif - { - return 9; - } - else - { - return 11; - } - } - else if (itemEffect[4] & 0x44) - { - return 2; - } - else if (itemEffect[4] & 0x2) - { - return 12; - } - else if (itemEffect[4] & 0x1) - { - return 13; - } - else if (itemEffect[5] & 0x8) - { - return 14; - } - else if (itemEffect[5] & 0x4) - { - return 15; - } - else if (itemEffect[5] & 0x2) - { - return 16; - } - else if (itemEffect[5] & 0x1) - { - return 17; - } - else if (itemEffect[4] & 0x80) - { - return 18; - } - else if (itemEffect[4] & 0x20) - { - return 19; - } - else if (itemEffect[5] & 0x10) - { - return 20; - } - else if (itemEffect[4] & 0x18) - { - return 21; - } - return 22; + return 11; } -#ifdef NONMATCHING -#undef itemEffect0 -#undef itemEffect3 -#undef mask -#endif + + if (itemEffect[4] & 0x44) + return 2; + else if (itemEffect[4] & 0x2) + return 12; + else if (itemEffect[4] & 0x1) + return 13; + else if (itemEffect[5] & 0x8) + return 14; + else if (itemEffect[5] & 0x4) + return 15; + else if (itemEffect[5] & 0x2) + return 16; + else if (itemEffect[5] & 0x1) + return 17; + else if (itemEffect[4] & 0x80) + return 18; + else if (itemEffect[4] & 0x20) + return 19; + else if (itemEffect[5] & 0x10) + return 20; + else if (itemEffect[4] & 0x18) + return 21; + else + return 22; } static void sub_81B7E4C(u8 taskId) From b3d48c0ed6426bb12ee7aa9815ff716ccbed62ae Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Feb 2019 19:45:06 +0100 Subject: [PATCH 31/42] Get rid of an unnecessary extern --- src/battle_message.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/battle_message.c b/src/battle_message.c index 7b8085219b..164108dece 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -37,8 +37,6 @@ struct BattleWindowText u8 shadowColor; }; -extern u8 gUnknown_0203C7B4; - extern const u8 gTrainerClassNames[][13]; extern const u16 gUnknown_08D85620[]; From 23b240ab658e0be6b114c36864fea19ff23eb61b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 11:04:38 +0100 Subject: [PATCH 32/42] Fix Menu and List Menu input defines --- asm/rom_8011DC0.s | 4 ++-- include/list_menu.h | 2 +- src/battle_pyramid_bag.c | 8 ++++---- src/daycare.c | 6 +++--- src/decoration.c | 14 +++++++------- src/field_specials.c | 8 ++++---- src/item_menu.c | 16 ++++++++-------- src/learn_move.c | 2 +- src/list_menu.c | 4 ++-- src/mauville_old_man.c | 4 ++-- src/player_pc.c | 36 +++++++++++++++++++----------------- src/pokeblock.c | 4 ++-- src/pokemon_storage_system.c | 4 ++-- src/rom_8011DC0.c | 6 +++--- src/script_menu.c | 4 ++-- src/secret_base.c | 10 +++++----- src/shop.c | 6 +++--- src/trader.c | 4 ++-- 18 files changed, 72 insertions(+), 70 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 64c0210018..af7fdbf3df 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -731,7 +731,7 @@ _080171DC: _08017228: mov r3, r9 ldrb r0, [r3] - bl ListMenuHandleInputGetItemId + bl ListMenu_ProcessInput mov r8, r0 ldr r0, =gMain ldrh r1, [r0, 0x2E] @@ -847,7 +847,7 @@ _08017314: _0801731C: mov r3, r10 ldrb r0, [r3] - bl ListMenuHandleInputGetItemId + bl ListMenu_ProcessInput adds r1, r0, 0 ldr r0, =gMain ldrh r2, [r0, 0x2E] diff --git a/include/list_menu.h b/include/list_menu.h index 84c38306b6..ef23688d85 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -101,7 +101,7 @@ extern struct ListMenuTemplate gMultiuseListMenuTemplate; s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *arg1, u16 scrollOffset, u16 selectedRow); -s32 ListMenuHandleInputGetItemId(u8 listTaskId); +s32 ListMenu_ProcessInput(u8 listTaskId); void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow); void RedrawListMenu(u8 listTaskId); void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 50baf48fd2..9bed2ab438 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -853,7 +853,7 @@ static void Task_HandlePyramidBagInput(u8 taskId) } else { - s32 listId = ListMenuHandleInputGetItemId(data[0]); + s32 listId = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition); switch (listId) { @@ -945,9 +945,9 @@ static void HandleFewMenuActionsInput(u8 taskId) s32 id = Menu_ProcessInputNoWrap(); switch (id) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); sMenuActions[ACTION_CANCEL].func.void_u8(taskId); break; @@ -1285,7 +1285,7 @@ static void Task_ItemSwapHandleInput(u8 taskId) } else { - s32 id = ListMenuHandleInputGetItemId(data[0]); + s32 id = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition); sub_81C7028(FALSE); sub_81C704C(gPyramidBagCursorData.cursorPosition); diff --git a/src/daycare.c b/src/daycare.c index 6bdbd987e0..b75fab2924 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1244,15 +1244,15 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y) static void Task_HandleDaycareLevelMenuInput(u8 taskId) { - u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId); + u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuListTaskId); if (gMain.newKeys & A_BUTTON) { - switch (var) + switch (input) { case 0: case 1: - gSpecialVar_Result = var; + gSpecialVar_Result = input; break; case 5: gSpecialVar_Result = 2; diff --git a/src/decoration.c b/src/decoration.c index c4c3d61713..5a688704f0 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -526,14 +526,14 @@ void sub_8126B80(u8 taskId) PlaySE(SE_SELECT); sSecretBasePCMenuActions[sSecretBasePCMenuCursorPos].func.void_u8(taskId); break; - case -2: + case MENU_NOTHING_CHOSEN: sSecretBasePCMenuCursorPos = Menu_GetCursorPos(); if ((s8)menuPos != sSecretBasePCMenuCursorPos) { sub_8126C08(); } break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); SecretBasePC_Cancel(taskId); break; @@ -713,12 +713,12 @@ void sub_8127088(u8 taskId) input = Menu_ProcessInput(); switch (input) { - case -1: + case MENU_B_PRESSED: case 8: PlaySE(SE_SELECT); sub_812719C(taskId); break; - case -2: + case MENU_NOTHING_CHOSEN: break; default: PlaySE(SE_SELECT); @@ -933,13 +933,13 @@ void sub_812764C(u8 taskId) data = gTasks[taskId].data; if (!gPaletteFade.active) { - input = ListMenuHandleInputGetItemId(data[13]); + input = ListMenu_ProcessInput(data[13]); ListMenuGetScrollAndRow(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo); switch (input) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); SecretBasePC_SelectedDecorActions[data[11]][1](taskId); break; diff --git a/src/field_specials.c b/src/field_specials.c index 0dc1bf18b1..f2ebf2b8e2 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2603,9 +2603,9 @@ static void sub_813A46C(s32 itemIndex, bool8 onInit, struct ListMenu *list) static void sub_813A4EC(u8 taskId) { struct Task *task = &gTasks[taskId]; - s32 itemId = ListMenuHandleInputGetItemId(task->data[14]); + s32 input = ListMenu_ProcessInput(task->data[14]); - switch (itemId) + switch (input) { case LIST_NOTHING_CHOSEN: break; @@ -2615,13 +2615,13 @@ static void sub_813A4EC(u8 taskId) sub_813A570(taskId); break; default: - gSpecialVar_Result = itemId; + gSpecialVar_Result = input; PlaySE(SE_SELECT); if (!task->data[6]) { sub_813A570(taskId); } - else if (itemId == task->data[1] - 1) + else if (input == task->data[1] - 1) { sub_813A570(taskId); } diff --git a/src/item_menu.c b/src/item_menu.c index a220f02efc..24a50aa9a0 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1102,7 +1102,7 @@ void Task_BagMenu(u8 taskId) } else { - int listPosition = ListMenuHandleInputGetItemId(data[0]); + int listPosition = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos); switch (listPosition) { @@ -1304,7 +1304,7 @@ void bag_menu_swap_items(u8 taskId) void sub_81AC3C0(u8 taskId) { s16* data = gTasks[taskId].data; - int r7; + int input; if (sub_81221EC() != TRUE) { @@ -1316,15 +1316,15 @@ void sub_81AC3C0(u8 taskId) } else { - r7 = ListMenuHandleInputGetItemId(data[0]); + input = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); sub_80D4FC8(0); sub_80D4FEC(gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); - switch (r7) + switch (input) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) sub_81AC498(taskId); @@ -1546,9 +1546,9 @@ void Task_HandleInBattleItemMenuInput(u8 taskId) s8 r4 = Menu_ProcessInputNoWrap(); switch (r4) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); gUnknown_08613FB4[4].func.void_u8(taskId); break; diff --git a/src/learn_move.c b/src/learn_move.c index 4db83861e9..7a6916013a 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -638,7 +638,7 @@ static void HideSpritesAndPrintTeachText(bool8 a) static void HandleInput(bool8 showContest) { - s32 itemId = ListMenuHandleInputGetItemId(sLearnMoveStruct->listMenuTask); + s32 itemId = ListMenu_ProcessInput(sLearnMoveStruct->listMenuTask); ListMenuGetScrollAndRow(sLearnMoveStruct->listMenuTask, &sLearnMoveStruct2.listOffset, &sLearnMoveStruct2.listRow); switch (itemId) diff --git a/src/list_menu.c b/src/list_menu.c index 2476fae265..7a95476614 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -334,7 +334,7 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu sMysteryGiftLinkMenu.state = 1; break; case 1: - sMysteryGiftLinkMenu.currItemId = ListMenuHandleInputGetItemId(sMysteryGiftLinkMenu.listTaskId); + sMysteryGiftLinkMenu.currItemId = ListMenu_ProcessInput(sMysteryGiftLinkMenu.listTaskId); if (gMain.newKeys & A_BUTTON) { sMysteryGiftLinkMenu.state = 2; @@ -406,7 +406,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu return taskId; } -s32 ListMenuHandleInputGetItemId(u8 listTaskId) +s32 ListMenu_ProcessInput(u8 listTaskId) { struct ListMenu *list = (void*) gTasks[listTaskId].data; diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 1b4a252179..fd8e74c0a7 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -1182,9 +1182,9 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu break; case 1: selection = Menu_ProcessInput(); - if (selection == -2) + if (selection == MENU_NOTHING_CHOSEN) break; - if (selection == -1 || selection == GetFreeStorySlot()) + if (selection == MENU_B_PRESSED || selection == GetFreeStorySlot()) { gSpecialVar_Result = 0; } diff --git a/src/player_pc.c b/src/player_pc.c index 474cecaf53..cff47ebc62 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -355,11 +355,11 @@ static void PlayerPCProcessMenuInput(u8 taskId) else inputOptionId = Menu_ProcessInputNoWrap(); - switch(inputOptionId) + switch (inputOptionId) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); sub_8198070(data[4], FALSE); ClearWindowTilemap(data[4]); @@ -464,13 +464,13 @@ static void ItemStorageMenuProcessInput(u8 taskId) r5 = Menu_GetCursorPos(); inputOptionId = Menu_ProcessInput(); r2 = Menu_GetCursorPos(); - switch(inputOptionId) + switch (inputOptionId) { - case -2: + case MENU_NOTHING_CHOSEN: if (r5 != r2) ItemStorageMenuPrint(gPCText_OptionDescList[r2]); break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); ItemStorage_Exit(taskId); break; @@ -638,14 +638,14 @@ static void Mailbox_ProcessInput(u8 taskId) if (!gPaletteFade.active) { - inputOptionId = ListMenuHandleInputGetItemId(data[5]); + inputOptionId = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); - switch(inputOptionId) + switch (inputOptionId) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId); Mailbox_ReturnToPlayerPC(taskId); @@ -1145,13 +1145,13 @@ static void ItemStorage_ProcessInput(u8 taskId) } else { - id = ListMenuHandleInputGetItemId(data[5]); + id = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); switch(id) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); ItemStorage_GoBackToPlayerPCMenu(taskId); break; @@ -1218,21 +1218,23 @@ static void sub_816C4FC(u8 taskId) ItemStorage_DoItemSwap(taskId, FALSE); return; } - id = ListMenuHandleInputGetItemId(data[5]); + id = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); sub_81223FC(gUnknown_0203BCC4->spriteIds, 7, 0); sub_816C690(playerPCItemPageInfo.cursorPos); switch(id) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: if (gMain.newKeys & A_BUTTON) { ItemStorage_DoItemSwap(taskId, FALSE); } else - ItemStorage_DoItemSwap(taskId, TRUE); + { + ItemStorage_DoItemSwap(taskId, TRUE); + } break; default: ItemStorage_DoItemSwap(taskId, FALSE); diff --git a/src/pokeblock.c b/src/pokeblock.c index 7c07f96559..3fd4f34df4 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -998,7 +998,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) else { u16 oldPosition = sSavedPokeblockData.lastItemPos; - s32 itemId = ListMenuHandleInputGetItemId(data[0]); + s32 itemId = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); if (oldPosition != sSavedPokeblockData.lastItemPos) @@ -1044,7 +1044,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId) { u16 i = sSavedPokeblockData.lastItemPage; u16 var = sSavedPokeblockData.lastItemPos; - s32 itemId = ListMenuHandleInputGetItemId(data[0]); + s32 itemId = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 78fec2fc5f..c0aec4dddd 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1753,7 +1753,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[2] = Menu_ProcessInput(); switch(task->data[2]) { - case -2: + case MENU_NOTHING_CHOSEN: task->data[3] = task->data[1]; if (gMain.newKeys & DPAD_UP && --task->data[3] < 0) task->data[3] = 4; @@ -1767,7 +1767,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); } break; - case -1: + case MENU_B_PRESSED: case 4: sub_819746C(task->data[15], TRUE); ScriptContext2_Disable(); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 41f7eeee74..c5ad67fbcd 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1105,7 +1105,7 @@ void sub_80134E8(u8 taskId) RedrawListMenu(data->listTaskId); break; case 0: - id = ListMenuHandleInputGetItemId(data->listTaskId); + id = ListMenu_ProcessInput(data->listTaskId); if (gMain.newKeys & A_BUTTON && id != -1) { // this unused variable along with the assignment is needed to match @@ -2176,7 +2176,7 @@ void sub_8014F48(u8 taskId) RedrawListMenu(data->listTaskId); break; case 0: - id = ListMenuHandleInputGetItemId(data->listTaskId); + id = ListMenu_ProcessInput(data->listTaskId); if (gMain.newKeys & A_BUTTON && id != -1) { // this unused variable along with the assignment is needed to match @@ -2340,7 +2340,7 @@ void sub_80152F4(u8 taskId) break; case 0: if (data->field_13 != 0) - id = ListMenuHandleInputGetItemId(data->listTaskId); + id = ListMenu_ProcessInput(data->listTaskId); if (data->field_14 > 120) { if (data->field_0->arr[0].field_1A_0 == 1 && !data->field_0->arr[0].unk.field_0.unk_0a_7) diff --git a/src/script_menu.c b/src/script_menu.c index a4f4c6086c..7180bfc607 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1170,9 +1170,9 @@ static void Task_HandleMultichoiceInput(u8 taskId) sub_80E2A94(tMultichoiceId); } - if (selection != -2) + if (selection != MENU_NOTHING_CHOSEN) { - if (selection == -1) + if (selection == MENU_B_PRESSED) { if (tIgnoreBPress) return; diff --git a/src/secret_base.c b/src/secret_base.c index de5fae0777..adcab9cbc3 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -953,13 +953,13 @@ void sub_80E9E90(u8 taskId) s32 input; data = gTasks[taskId].data; - input = ListMenuHandleInputGetItemId(data[5]); + input = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &data[2], &data[1]); switch (input) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); DestroyListMenuTask(data[5], NULL, NULL); RemoveScrollIndicatorArrowPair(data[8]); @@ -1002,11 +1002,11 @@ void sub_80E9FB0(u8 taskId) input = Menu_ProcessInputNoWrap(); switch (input) { - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); sub_80EA18C(taskId); break; - case -2: + case MENU_NOTHING_CHOSEN: break; default: PlaySE(SE_SELECT); diff --git a/src/shop.c b/src/shop.c index c44cbca12e..8eefd5e97f 100755 --- a/src/shop.c +++ b/src/shop.c @@ -328,9 +328,9 @@ static void Task_ShopMenu(u8 taskId) s8 inputCode = Menu_ProcessInputNoWrap(); switch (inputCode) { - case LIST_B_PRESSED: + case MENU_NOTHING_CHOSEN: break; - case LIST_NOTHING_CHOSEN: + case MENU_B_PRESSED: PlaySE(SE_SELECT); Task_HandleShopMenuQuit(taskId); break; @@ -911,7 +911,7 @@ static void Task_BuyMenu(u8 taskId) if (!gPaletteFade.active) { - s32 itemId = ListMenuHandleInputGetItemId(tListTaskId); + s32 itemId = ListMenu_ProcessInput(tListTaskId); ListMenuGetScrollAndRow(tListTaskId, &gShopDataPtr->scrollOffset, &gShopDataPtr->selectedRow); switch (itemId) diff --git a/src/trader.c b/src/trader.c index e23efb4ce5..b5c159fb96 100644 --- a/src/trader.c +++ b/src/trader.c @@ -113,9 +113,9 @@ void Task_HandleGetDecorationMenuInput(u8 taskId) switch (input) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: case 4: PlaySE(SE_SELECT); sub_8133BE4(taskId, 0); From a740bc719037612da65941482e4a0dab4837c629 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 11:32:00 +0100 Subject: [PATCH 33/42] Name action 11 --- include/battle.h | 7 ++++--- src/battle_main.c | 6 +++--- src/battle_script_commands.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/battle.h b/include/battle.h index 9295a35481..94596c75ea 100644 --- a/include/battle.h +++ b/include/battle.h @@ -28,10 +28,11 @@ #define B_ACTION_SAFARI_GO_NEAR 7 #define B_ACTION_SAFARI_RUN 8 #define B_ACTION_WALLY_THROW 9 -// The exact purposes of these are unclear -#define B_ACTION_EXEC_SCRIPT 10 // when executing an action +#define B_ACTION_EXEC_SCRIPT 10 +#define B_ACTION_TRY_FINISH 11 +#define B_ACTION_FINISHED 12 + #define B_ACTION_CANCEL_PARTNER 12 // when choosing an action -#define B_ACTION_FINISHED 12 // when executing an action #define B_ACTION_NOTHING_FAINTED 13 // when choosing an action #define B_ACTION_NONE 0xFF diff --git a/src/battle_main.c b/src/battle_main.c index 09ea3dfc9a..043e758087 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -139,7 +139,7 @@ static void HandleAction_ThrowPokeblock(void); static void HandleAction_GoNear(void); static void HandleAction_SafariZoneRun(void); static void HandleAction_WallyBallThrow(void); -static void HandleAction_Action11(void); +static void HandleAction_TryFinish(void); static void HandleAction_NothingIsFainted(void); static void HandleAction_ActionFinished(void); @@ -553,7 +553,7 @@ static void (* const sTurnActionsFuncsTable[])(void) = [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow, [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript, - [11] = HandleAction_Action11, // not sure about this one + [B_ACTION_TRY_FINISH] = HandleAction_TryFinish, [B_ACTION_FINISHED] = HandleAction_ActionFinished, [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted, }; @@ -5845,7 +5845,7 @@ static void HandleAction_WallyBallThrow(void) gActionsByTurnOrder[1] = B_ACTION_FINISHED; } -static void HandleAction_Action11(void) +static void HandleAction_TryFinish(void) { if (!HandleFaintedMonActions()) { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6bbee842ea..6023b2c1b6 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4233,13 +4233,13 @@ static void atk3D_end(void) gMoveResultFlags = 0; gActiveBattler = 0; - gCurrentActionFuncId = 0xB; + gCurrentActionFuncId = B_ACTION_TRY_FINISH; } static void atk3E_end2(void) { gActiveBattler = 0; - gCurrentActionFuncId = 0xB; + gCurrentActionFuncId = B_ACTION_TRY_FINISH; } static void atk3F_end3(void) // pops the main function stack From a7f94bbeeaaee3ef6c1f192c9010ca39d3262884 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 11:55:11 +0100 Subject: [PATCH 34/42] Dump last battle anim file --- data/battle_anim_80A9C70.s | 89 ------------------- include/battle_anim.h | 4 + ld_script.txt | 1 - src/battle_anim_80A9C70.c | 176 +++++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+), 90 deletions(-) delete mode 100644 data/battle_anim_80A9C70.s diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s deleted file mode 100644 index f82a657b91..0000000000 --- a/data/battle_anim_80A9C70.s +++ /dev/null @@ -1,89 +0,0 @@ -#include "constants/battle_anim.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0853EDE4:: @ 853EDE4 - .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EDF8:: @ 853EDF8 - .4byte gUnknown_0853EDE4 - - .align 2 -gUnknown_0853EDFC:: @ 853EDFC - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C - - .align 2 -gUnknown_0853EE2C:: @ 853EE2C - .2byte 0x0000, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EE34:: @ 853EE34 - .4byte gUnknown_0853EE2C - - .align 2 -gUnknown_0853EE38:: @ 853EE38 - spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 - - .align 2 -gUnknown_0853EE50:: @ 853EE50 - spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 - - .align 2 -gUnknown_0853EE68:: @ 853EE68 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0040, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_0853EE80:: @ 853EE80 - .4byte gUnknown_0853EE68 - - .align 2 -gUnknown_0853EE84:: @ 853EE84 - spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64 - spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - - .align 2 -gUnknown_0853EEB4:: @ 853EEB4 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEBC:: @ 853EEBC - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEC4:: @ 853EEC4 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EECC:: @ 853EECC - .4byte gUnknown_0853EEB4 - .4byte gUnknown_0853EEBC - .4byte gUnknown_0853EEC4 - - .align 2 -gUnknown_0853EED8:: @ 853EED8 - spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - - .align 2 -gUnknown_0853EEF0:: @ 853EEF0 - .2byte 0x0000, 0x000f, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEF8:: @ 853EEF8 - .4byte gUnknown_0853EEF0 - - .align 2 -gUnknown_0853EEFC:: @ 853EEFC - .2byte 0x0060, 0x0060, 0x0000, 0x0000, 0x0002, 0x0002, 0x0100, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0853EF14:: @ 853EF14 - .4byte gUnknown_0853EEFC - - .align 2 -gUnknown_0853EF18:: @ 853EF18 - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C diff --git a/include/battle_anim.h b/include/battle_anim.h index fc0f603eb0..8e8a176753 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -75,6 +75,10 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s void sub_80A6450(struct Sprite *sprite); +void sub_80A8AEC(struct Sprite *sprite); +void sub_80A8A6C(struct Sprite *sprite); +void sub_80A8E30(struct Sprite *sprite); +void sub_80A8B64(struct Sprite *sprite); void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); void DestroySpriteAndMatrix(struct Sprite *sprite); void AnimTranslateLinearSimple(struct Sprite *sprite); diff --git a/ld_script.txt b/ld_script.txt index bf8d4bde94..306a1f4b07 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -441,7 +441,6 @@ SECTIONS { src/battle_anim.o(.rodata); src/battle_anim_80A5C6C.o(.rodata); data/map_events.o(.rodata); - data/battle_anim_80A9C70.o(.rodata); src/battle_anim_80A9C70.o(.rodata); src/title_screen.o(.rodata); src/field_weather.o(.rodata); diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c index 001f99d7fa..1271680e02 100644 --- a/src/battle_anim_80A9C70.c +++ b/src/battle_anim_80A9C70.c @@ -28,6 +28,182 @@ static void sub_80A9E44(struct Sprite *sprite); static void sub_80A9E78(struct Sprite *sprite); // const rom data +static const union AnimCmd sSpriteAnim_853EDE4[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(4, 3), + ANIMCMD_FRAME(8, 3), + ANIMCMD_FRAME(12, 3), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EDF8[] = +{ + sSpriteAnim_853EDE4 +}; + +const struct SpriteTemplate gUnknown_0853EDFC = +{ + .tileTag = ANIM_TAG_UNUSED_ORB, + .paletteTag = ANIM_TAG_UNUSED_ORB, + .oam = &gUnknown_0852490C, + .anims = sSpriteAnimTable_853EDF8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8AEC, +}; + +const struct SpriteTemplate gUnknown_0853EE14 = +{ + .tileTag = ANIM_TAG_UNUSED_ORB, + .paletteTag = ANIM_TAG_UNUSED_ORB, + .oam = &gUnknown_0852490C, + .anims = sSpriteAnimTable_853EDF8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8A6C, +}; + +static const union AnimCmd sSpriteAnim_853EE2C[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EE34[] = +{ + sSpriteAnim_853EE2C +}; + +const struct SpriteTemplate gUnknown_0853EE38 = +{ + .tileTag = ANIM_TAG_WEATHER_BALL, + .paletteTag = ANIM_TAG_WEATHER_BALL, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EE34, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8E30, +}; + +const struct SpriteTemplate gUnknown_0853EE50 = +{ + .tileTag = ANIM_TAG_WEATHER_BALL, + .paletteTag = ANIM_TAG_WEATHER_BALL, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EE34, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8EE4, +}; + +static const union AnimCmd sSpriteAnim_853EE68[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(16, 3), + ANIMCMD_FRAME(32, 3), + ANIMCMD_FRAME(48, 3), + ANIMCMD_FRAME(64, 3), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_853EE80[] = +{ + sSpriteAnim_853EE68 +}; + +const struct SpriteTemplate gUnknown_0853EE84 = +{ + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EE80, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8B64, +}; + +const struct SpriteTemplate gUnknown_0853EE9C = +{ + .tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT, + .paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT, + .oam = &gUnknown_08524914, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8AEC, +}; + +static const union AnimCmd sSpriteAnim_853EEB4[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd sSpriteAnim_853EEBC[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd sSpriteAnim_853EEC4[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EECC[] = +{ + sSpriteAnim_853EEB4, + sSpriteAnim_853EEBC, + sSpriteAnim_853EEC4 +}; + +const struct SpriteTemplate gUnknown_0853EED8 = +{ + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EECC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8AEC, +}; + +static const union AnimCmd sSpriteAnim_853EEF0[] = +{ + ANIMCMD_FRAME(0, 15), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EEF8[] = +{ + sSpriteAnim_853EEF0 +}; + +static const union AffineAnimCmd sSpriteAffineAnim_853EEFC[] = +{ + AFFINEANIMCMD_FRAME(96, 96, 0, 0), + AFFINEANIMCMD_FRAME(2, 2, 0, 1), + AFFINEANIMCMD_JUMP(1) +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] = +{ + sSpriteAffineAnim_853EEFC +}; + +const struct SpriteTemplate gUnknown_0853EF18 = +{ + .tileTag = ANIM_TAG_UNUSED_ORB, + .paletteTag = ANIM_TAG_UNUSED_ORB, + .oam = &gUnknown_085249CC, + .anims = sSpriteAnimTable_853EEF8, + .images = NULL, + .affineAnims = sSpriteAffineAnimTable_853EEF8, + .callback = sub_80A8A6C, +}; + static const struct Subsprite gUnknown_0853EF30[] = { {.x = -16, .y = -16, .shape = ST_OAM_SQUARE, .size = 3, .tileOffset = 0, .priority = 2}, From 363fa9bed25ad58e0b43bf3941903f5e83359f29 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 12:44:00 +0100 Subject: [PATCH 35/42] Clean up ram vars --- common_syms/contest_painting.txt | 4 ++ common_syms/contest_painting_effects.txt | 10 ++++ common_syms/evolution_scene.txt | 1 + common_syms/party_menu.txt | 1 + common_syms/pokedex_cry_screen.txt | 1 + include/contest.h | 2 + include/contest_painting.h | 3 -- include/party_menu.h | 2 + include/pokedex_cry_screen.h | 2 + include/trade.h | 3 ++ src/cable_club.c | 4 +- src/contest.c | 2 + src/contest_link_80F57C4.c | 16 +++---- src/contest_painting.c | 13 ++--- src/contest_painting_effects.c | 19 ++++---- src/dragon.c | 4 +- src/evolution_scene.c | 15 +++--- src/item_use.c | 5 +- src/party_menu.c | 4 +- src/pokedex.c | 2 - src/pokedex_cry_screen.c | 5 +- src/rom_8011DC0.c | 2 - src/trainer_card.c | 1 + sym_common.txt | 61 ++++-------------------- sym_ewram.txt | 36 ++------------ 25 files changed, 86 insertions(+), 132 deletions(-) create mode 100644 common_syms/contest_painting.txt create mode 100644 common_syms/contest_painting_effects.txt create mode 100644 common_syms/evolution_scene.txt create mode 100644 common_syms/party_menu.txt create mode 100644 common_syms/pokedex_cry_screen.txt diff --git a/common_syms/contest_painting.txt b/common_syms/contest_painting.txt new file mode 100644 index 0000000000..1fba37a59d --- /dev/null +++ b/common_syms/contest_painting.txt @@ -0,0 +1,4 @@ +gUnknown_03006190 +gUnknown_030061A0 +gUnknown_030061C0 +gContestPaintingMonPalette diff --git a/common_syms/contest_painting_effects.txt b/common_syms/contest_painting_effects.txt new file mode 100644 index 0000000000..2f3d792196 --- /dev/null +++ b/common_syms/contest_painting_effects.txt @@ -0,0 +1,10 @@ +gUnknown_03006164 +gUnknown_03006168 +gUnknown_0300616C +gUnknown_03006170 +gUnknown_03006174 +gUnknown_03006178 +gUnknown_0300617C +gUnknown_03006180 +gUnknown_03006184 +gUnknown_03006188 diff --git a/common_syms/evolution_scene.txt b/common_syms/evolution_scene.txt new file mode 100644 index 0000000000..137cd3e05d --- /dev/null +++ b/common_syms/evolution_scene.txt @@ -0,0 +1 @@ +gCB2_AfterEvolution diff --git a/common_syms/party_menu.txt b/common_syms/party_menu.txt new file mode 100644 index 0000000000..53e72fa531 --- /dev/null +++ b/common_syms/party_menu.txt @@ -0,0 +1 @@ +gUnknown_03006328 diff --git a/common_syms/pokedex_cry_screen.txt b/common_syms/pokedex_cry_screen.txt new file mode 100644 index 0000000000..d16ec36d64 --- /dev/null +++ b/common_syms/pokedex_cry_screen.txt @@ -0,0 +1 @@ +gDexCryScreenState diff --git a/include/contest.h b/include/contest.h index 35b88698e3..e4391a3273 100644 --- a/include/contest.h +++ b/include/contest.h @@ -437,6 +437,8 @@ extern u8 gHighestRibbonRank; extern struct ContestResources *gContestResources; extern u8 sContestBgCopyFlags; extern struct ContestWinner gUnknown_02039F3C; +extern u8 gUnknown_02039F5C; +extern u8 gUnknown_02039F5D; extern u32 gContestRngValue; diff --git a/include/contest_painting.h b/include/contest_painting.h index ca03a72b5b..c633c50ccc 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -13,7 +13,4 @@ enum void sub_812FDA8(int); void CB2_ContestPainting(void); -extern u8 gUnknown_02039F5C; -extern u8 gUnknown_02039F5D; - #endif diff --git a/include/party_menu.h b/include/party_menu.h index ae7c414a8e..702b4fde17 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -48,6 +48,8 @@ extern MainCallback gPostMenuFieldCallback; extern u8 gSelectedOrderFromParty[4]; extern u8 gUnknown_0203CF00[3]; +extern void (*gUnknown_03006328)(u8, TaskFunc); + extern const u16 gTutorMoves[]; void sub_81B0FCC(u8 slot, u8 b); diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h index 392e80a6d3..93f1b02a5c 100755 --- a/include/pokedex_cry_screen.h +++ b/include/pokedex_cry_screen.h @@ -10,6 +10,8 @@ struct CryRelatedStruct u8 yPos; }; +extern u8 gDexCryScreenState; + bool8 sub_8145354(struct CryRelatedStruct*, u8); void sub_814545C(u8); void sub_8145534(u16); diff --git a/include/trade.h b/include/trade.h index 95a10cacf5..0c95e1e81f 100644 --- a/include/trade.h +++ b/include/trade.h @@ -6,8 +6,11 @@ // Exported type declarations // Exported RAM declarations +extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; +extern u8 gUnknown_02032298[2]; // Exported ROM declarations +extern const struct WindowTemplate gUnknown_0833900C; s32 sub_807A728(void); void sub_80773AC(void); diff --git a/src/cable_club.c b/src/cable_club.c index ce9b9db058..303b0d016c 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -27,12 +27,10 @@ #include "task.h" #include "trade.h" #include "trainer_card.h" +#include "party_menu.h" #include "window.h" #include "constants/songs.h" -extern u8 gUnknown_02032298[2]; -extern u8 gSelectedOrderFromParty[]; - static const struct WindowTemplate gUnknown_08550594 = { .bg = 0, .tilemapLeft = 16, diff --git a/src/contest.c b/src/contest.c index b24036f39b..cf084e35e4 100644 --- a/src/contest.c +++ b/src/contest.c @@ -214,6 +214,8 @@ EWRAM_DATA u8 gHighestRibbonRank = 0; EWRAM_DATA struct ContestResources *gContestResources = NULL; EWRAM_DATA u8 sContestBgCopyFlags = 0; EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0}; +EWRAM_DATA u8 gUnknown_02039F5C = 0; +EWRAM_DATA u8 gUnknown_02039F5D = 0; // IWRAM common vars. u32 gContestRngValue; diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index 721a4f8706..381fb34fab 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -3,7 +3,6 @@ #include "bg.h" #include "contest.h" #include "contest_link_80F57C4.h" -#include "contest_painting.h" #include "decompress.h" #include "dma3.h" #include "event_data.h" @@ -67,10 +66,9 @@ struct ContestLink80F57C4 u8 *unkC[4]; }; +EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL; + extern const struct CompressedSpriteSheet gMonFrontPicTable[]; - -extern struct ContestLink80F57C4 *gUnknown_0203A034; - extern const struct BgTemplate gUnknown_0858D888[4]; extern const struct WindowTemplate gUnknown_0858D898[]; extern const struct CompressedSpriteSheet gUnknown_0858D878[]; @@ -138,7 +136,7 @@ void sub_80F57C4(void) InitBgsFromTemplates(0, gUnknown_0858D888, ARRAY_COUNT(gUnknown_0858D888)); for (i = 0; i < 4; i++) SetBgTilemapBuffer(i, gUnknown_0203A034->unkC[i]); - + InitWindows(gUnknown_0858D898); DeactivateAllTextPrinters(); SetGpuReg(REG_OFFSET_MOSAIC, 0); @@ -720,7 +718,7 @@ static void sub_80F66B4(u8 taskId) { nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species); GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN); - } + } } gTasks[taskId].data[10] = 0; @@ -761,7 +759,7 @@ static void sub_80F67C4(u8 taskId) { if (!(gIsLinkContest & 0x1)) BravoTrainerPokemonProfile_BeforeInterview2(gContestFinalStandings[gContestPlayerMonIndex]); - + BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0); gTasks[taskId].func = sub_80F6820; } @@ -1282,7 +1280,7 @@ static void sub_80F6F68(struct Sprite *sprite) struct Sprite *sprite2 = &gSprites[sprite->data[i]]; sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64; } - + if (sprite->pos1.x == sprite->data[4]) sprite->callback = sub_80F6FDC; } @@ -1348,7 +1346,7 @@ static void sub_80F7144(void) sprite->invisible = 1; for (i = 0; i < 3; i++) gSprites[sprite->data[i]].invisible = 1; - + gBattle_WIN0H = 0; gBattle_WIN0V = 0; SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H); diff --git a/src/contest_painting.c b/src/contest_painting.c index 0ed169a774..71a110aa84 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -20,10 +20,11 @@ #include "window.h" #include "constants/rgb.h" -extern u16 (*gUnknown_03006190)[][32]; -extern struct ContestWinner *gUnknown_030061C0; -extern u16 *gContestPaintingMonPalette; -extern struct Unk030061A0 gUnknown_030061A0; +// IWRAM common +u16 (*gUnknown_03006190)[][32]; +struct Unk030061A0 gUnknown_030061A0; +struct ContestWinner *gUnknown_030061C0; +u16 *gContestPaintingMonPalette; // IWRAM bss IWRAM_DATA u8 gContestPaintingState; @@ -103,7 +104,7 @@ const u8 *const gContestRankTextPointers[] = gContestLink, }; -const struct BgTemplate gUnknown_085B07E8[] = +const struct BgTemplate gUnknown_085B07E8[] = { { .bg = 1, @@ -116,7 +117,7 @@ const struct BgTemplate gUnknown_085B07E8[] = }, }; -const struct WindowTemplate gUnknown_085B07EC = +const struct WindowTemplate gUnknown_085B07EC = { .bg = 1, .tilemapLeft = 2, diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c index 187a0f1968..142ad7bc91 100644 --- a/src/contest_painting_effects.c +++ b/src/contest_painting_effects.c @@ -3,14 +3,17 @@ #include "contest_painting.h" #include "constants/rgb.h" -extern u8 gUnknown_03006164; -extern u16 (*gUnknown_03006168)[][32]; -extern u8 gUnknown_0300616C; -extern u8 gUnknown_03006170; -extern u8 gUnknown_03006174; -extern u8 gUnknown_03006178; -extern u8 gUnknown_0300617C; -extern u8 gUnknown_03006180; +// IWRAM common +u8 gUnknown_03006164; +u16 (*gUnknown_03006168)[][32]; +u8 gUnknown_0300616C; +u8 gUnknown_03006170; +u8 gUnknown_03006174; +u8 gUnknown_03006178; +u8 gUnknown_0300617C; +u8 gUnknown_03006180; +u16 gUnknown_03006184; +u16 gUnknown_03006188; // this file's functions void sub_8125230(void); diff --git a/src/dragon.c b/src/dragon.c index 4a2ac1c515..9b39a8a30e 100644 --- a/src/dragon.c +++ b/src/dragon.c @@ -5,8 +5,6 @@ #include "trig.h" #include "constants/rgb.h" -extern u16 gUnknown_0203A100[]; - void sub_8113064(struct Sprite *); void sub_81131B4(struct Sprite *); void sub_8113224(struct Sprite *); @@ -17,6 +15,8 @@ static void sub_81134B8(u8); static void sub_8113574(struct Task *); static void sub_811369C(struct Sprite *); +EWRAM_DATA static u16 gUnknown_0203A100[7] = {0}; + const union AnimCmd gUnknown_08596E60[] = { ANIMCMD_FRAME(0, 4), diff --git a/src/evolution_scene.c b/src/evolution_scene.c index c97e2d10fc..4bf7701be9 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -9,6 +9,7 @@ #include "evolution_graphics.h" #include "gpu_regs.h" #include "link.h" +#include "link_rfu.h" #include "m4a.h" #include "main.h" #include "menu.h" @@ -16,10 +17,12 @@ #include "palette.h" #include "pokedex.h" #include "pokemon.h" +#include "pokemon_summary_screen.h" #include "scanline_effect.h" #include "sound.h" #include "sprite.h" #include "string_util.h" +#include "strings.h" #include "task.h" #include "text.h" #include "text_window.h" @@ -39,22 +42,18 @@ struct EvoInfo u16 savedPalette[48]; }; +// EWRAM vars static EWRAM_DATA struct EvoInfo *sEvoStructPtr = NULL; static EWRAM_DATA u16 *sEvoMovingBgPtr = NULL; +// IWRAM common +void (*gCB2_AfterEvolution)(void); + #define sEvoCursorPos gBattleCommunication[1] // when learning a new move #define sEvoGraphicsTaskID gBattleCommunication[2] -extern const struct WindowTemplate gUnknown_0833900C; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; -// strings -extern const u8 gText_CommunicationStandby5[]; - -extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move); -extern u8 sub_81C1B94(void); -extern void sub_800E084(void); - // this file's functions static void Task_EvolutionScene(u8 taskID); static void Task_TradeEvolutionScene(u8 taskID); diff --git a/src/item_use.c b/src/item_use.c index 6a7f6cec05..0ea5f6acf7 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -38,8 +38,6 @@ #include "constants/songs.h" #include "constants/vars.h" -extern void(*gUnknown_0203A0F4)(u8 taskId); -extern void (*gUnknown_03006328)(u8, TaskFunc); extern void unknown_ItemMenu_Confirm(u8 taskId); extern void sub_81C5B14(u8 taskId); extern void ScriptUnfreezeEventObjects(void); @@ -100,6 +98,9 @@ void sub_80FDBEC(void); bool8 sub_80FDE2C(void); void ItemUseOutOfBattle_CannotUse(u8 taskId); +// EWRAM variables +EWRAM_DATA static void(*gUnknown_0203A0F4)(u8 taskId) = NULL; + // .rodata static const MainCallback gUnknown_085920D8[] = diff --git a/src/party_menu.c b/src/party_menu.c index 8193fcf31a..15b5d24d8e 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -119,6 +119,7 @@ struct Struct203CEDC u8 unkC; }; +// EWRAM vars static EWRAM_DATA struct Struct203CEC4 *gUnknown_0203CEC4 = NULL; EWRAM_DATA struct Struct203CEC8 gUnknown_0203CEC8 = {0}; static EWRAM_DATA struct Struct203CEDC *gUnknown_0203CEDC = NULL; @@ -134,7 +135,8 @@ static EWRAM_DATA u16 gUnknown_0203CEFC = 0; static EWRAM_DATA u16 gUnknown_0203CEFE = 0; // unused EWRAM_DATA u8 gUnknown_0203CF00[3] = {0}; -extern void (*gUnknown_03006328)(u8, TaskFunc); +// IWRAM common +void (*gUnknown_03006328)(u8, TaskFunc); static void reset_brm(void); static void PartyMenuInitCallback(void); diff --git a/src/pokedex.c b/src/pokedex.c index f99a8226a8..c47ada5b8b 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -30,8 +30,6 @@ #include "constants/songs.h" #include "constants/species.h" -extern u8 gDexCryScreenState; - // EWRAM static EWRAM_DATA struct PokedexView *sPokedexView = NULL; static EWRAM_DATA u16 gUnknown_02039B50 = 0; diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 4a9227b996..c385141d53 100755 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -39,7 +39,10 @@ static void sub_8145824(u8, s16, u8); static void sub_814596C(struct Sprite *); static void sub_8145B24(s8); -extern u8 gDexCryScreenState; +// IWRAM common +u8 gDexCryScreenState; + +// EWRAM vars static EWRAM_DATA struct PokedexCryScreen *sDexCryScreen = NULL; static EWRAM_DATA u8 *sCryWaveformWindowTiledata = NULL; static EWRAM_DATA struct PokedexCryVolumeMeter *sCryVolumeMeter = NULL; diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 41f7eeee74..3b679e1d98 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -189,8 +189,6 @@ extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; extern u8 gUnknown_03005DB4; -extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; -extern u8 gUnknown_02032298[2]; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; diff --git a/src/trainer_card.c b/src/trainer_card.c index b7bd5cc1dd..49a62284f9 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -93,6 +93,7 @@ struct TrainerCardData extern u8 sub_80D30A0(u16); // EWRAM +EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0}; EWRAM_DATA static struct TrainerCardData *sData = NULL; //this file's functions diff --git a/sym_common.txt b/sym_common.txt index 7ec936a934..414d223e96 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -23,57 +23,14 @@ .include "contest.o" .include "tv.o" .include "mauville_old_man.o" - -gUnknown_03006164: @ 3006164 + .include "contest_painting_effects.o" + .space 0x4 - -gUnknown_03006168: @ 3006168 - .space 0x4 - -gUnknown_0300616C: @ 300616C - .space 0x4 - -gUnknown_03006170: @ 3006170 - .space 0x4 - -gUnknown_03006174: @ 3006174 - .space 0x4 - -gUnknown_03006178: @ 3006178 - .space 0x4 - -gUnknown_0300617C: @ 300617C - .space 0x4 - -gUnknown_03006180: @ 3006180 - .space 0x4 - -gUnknown_03006184: @ 3006184 - .space 0x4 - -gUnknown_03006188: @ 3006188 - .space 0x8 - -gUnknown_03006190: @ 3006190 - .space 0x10 - -gUnknown_030061A0: @ 30061A0 - .space 0x20 - -gUnknown_030061C0: @ 30061C0 - .space 0x4 - -gContestPaintingMonPalette: @ 30061C4 - .space 0xC - + + .include "contest_painting.o" .include "field_specials.o" - -gCB2_AfterEvolution: @ 30061E8 - .space 0x4 - -gDexCryScreenState: @ 30061EC - .space 0x4 - + .include "evolution_scene.o" + .include "pokedex_cry_screen.o" .include "save.o" .include "battle_tower.o" .include "intro.o" @@ -84,9 +41,9 @@ gDexCryScreenState: @ 30061EC .space 0x8 .include "list_menu.o" - -gUnknown_03006328: @ 3006328 - .space 0x48 + .include "party_menu.o" + + .space 0x44 gUnknown_03006370: @ 3006370 .space 0x10 diff --git a/sym_ewram.txt b/sym_ewram.txt index 9e836d0fea..361c0921f6 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -140,19 +140,6 @@ gUnknown_02022D00: @ 2022D00 .include "src/scanline_effect.o" .include "src/option_menu.o" .include "src/pokedex.o" - -gTrainerCards: @ 2039B58 - .space 0x14 - -gUnknown_02039B6C: @ 2039B6C - .space 0x2 - -gUnknown_02039B6E: @ 2039B6E - .space 0x1A - -gUnknown_02039B88: @ 2039B88 - .space 0x160 - .include "src/trainer_card.o" .include "src/frontier_pass.o" .include "src/pokemon_storage_system.o" @@ -161,14 +148,6 @@ gUnknown_02039B88: @ 2039B88 .include "src/map_name_popup.o" .include "src/item.o" .include "src/contest.o" - - .align 2 -gUnknown_02039F5C: @ 2039F5C - .space 0x1 - -gUnknown_02039F5D: @ 2039F5D - .space 0x3 - .include "src/shop.o" .include "src/fldeff_escalator.o" .include "src/script_menu.o" @@ -177,21 +156,12 @@ gUnknown_02039F5D: @ 2039F5D .include "src/record_mixing.o" .include "src/secret_base.o" .include "src/tv.o" - -gUnknown_0203A034: @ 203A034 - .space 0x4 - + .include "src/contest_link_80F57C4.o" .include "src/rotating_gate.o" .include "src/safari_zone.o" - -gUnknown_0203A0F4: @ 203A0F4 - .space 0x4 - + .include "src/item_use.o" .include "src/battle_anim_effects_1.o" - -gUnknown_0203A100: @ 203A100 - .space 0x10 - + .include "src/dragon.o" .include "src/battle_anim_utility_funcs.o" .include "src/battle_intro.o" .include "src/easy_chat.o" From ea79f1c8f6803d69fad9b5cb64b4e9767b7c1903 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 19:41:34 +0100 Subject: [PATCH 36/42] tabs --- src/player_pc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/player_pc.c b/src/player_pc.c index cff47ebc62..0d08a5e7b2 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -1232,9 +1232,9 @@ static void sub_816C4FC(u8 taskId) ItemStorage_DoItemSwap(taskId, FALSE); } else - { - ItemStorage_DoItemSwap(taskId, TRUE); - } + { + ItemStorage_DoItemSwap(taskId, TRUE); + } break; default: ItemStorage_DoItemSwap(taskId, FALSE); From 031fd663939b6d6bf2d29a21ac3f155f1d593457 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sat, 2 Feb 2019 22:14:04 +0000 Subject: [PATCH 37/42] Label some summary screen functions --- src/pokemon_summary_screen.c | 123 ++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 14bfba4adb..b05f3129b5 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -173,7 +173,7 @@ static void sub_81C20F0(u8 taskId); static void sub_81C2194(u16 *a, u16 b, u8 c); static void sub_81C2228(struct Pokemon* mon); static void DrawExperienceProgressBar(struct Pokemon* mon); -static void sub_81C240C(u16 a); +static void DrawContestMoveHearts(u16 move); static void sub_81C2524(void); static void sub_81C2554(void); static void sub_81C25E8(void); @@ -223,17 +223,17 @@ static void PrintNewMoveDetailsOrCancelText(void); static void sub_81C4064(void); static void sub_81C40A0(u8 a, u8 b); static void PrintHMMovesCantBeForgotten(void); -static void sub_81C4190(void); -static void sub_81C4204(u8 a, u8 b); -static void sub_81C424C(void); -static void sub_81C4280(void); -static void sub_81C42C8(void); -static void sub_81C43A0(void); -static void sub_81C4420(void); -static void sub_81C4484(void); -static void sub_81C44F0(void); +static void ResetPssSpriteIds(void); +static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible); +static void HidePageSpecificSprites(void); +static void SetTypeIcons(void); +static void CreateMoveTypeIcons(void); +static void SetMonTypeIcons(void); +static void SetMoveTypeIcons(void); +static void SetContestMoveTypeIcons(void); +static void SetNewMoveTypeIcon(void); static void sub_81C4568(u8 a, u8 b); -static u8 sub_81C45F4(struct Pokemon *a, s16 *b); +static u8 CreatePokemonSprite(struct Pokemon *a, s16 *b); static u8 sub_81C47B4(struct Pokemon *unused); static void sub_81C4844(struct Sprite *); static void sub_81C48F0(void); @@ -968,13 +968,13 @@ static const union AnimCmd *const sSpriteAnimTable_StatusCondition[] = { sSpriteAnim_StatusPokerus, sSpriteAnim_StatusFaint, }; -static const struct CompressedSpriteSheet gUnknown_0861D0F8 = +static const struct CompressedSpriteSheet sStatusIconsSpriteSheet = { .data = gStatusGfx_Icons, .size = 0x380, .tag = 30001 }; -static const struct CompressedSpritePalette gUnknown_0861D100 = +static const struct CompressedSpritePalette sStatusIconsSpritePalette = { .data = gStatusPal_Icons, .tag = 30001 @@ -1141,13 +1141,13 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 16: - sub_81C4190(); - sub_81C42C8(); + ResetPssSpriteIds(); + CreateMoveTypeIcons(); pssData->unk40F0 = 0; gMain.state++; break; case 17: - pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0); + pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->unk40F0); if (pssData->spriteIds[0] != 0xFF) { pssData->unk40F0 = 0; @@ -1167,7 +1167,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 21: - sub_81C4280(); + SetTypeIcons(); gMain.state++; break; case 22: @@ -1259,11 +1259,11 @@ static bool8 SummaryScreen_DecompressGraphics(void) pssData->unk40F0++; break; case 9: - LoadCompressedSpriteSheet(&gUnknown_0861D0F8); + LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet); pssData->unk40F0++; break; case 10: - LoadCompressedSpritePalette(&gUnknown_0861D100); + LoadCompressedSpritePalette(&sStatusIconsSpritePalette); pssData->unk40F0++; break; case 11: @@ -1374,7 +1374,7 @@ static void sub_81C0348(void) } else { - sub_81C240C(pssData->summary.moves[pssData->firstMoveIndex]); + DrawContestMoveHearts(pssData->summary.moves[pssData->firstMoveIndex]); sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]); @@ -1510,7 +1510,7 @@ static void sub_81C0604(u8 taskId, s8 a) PlaySE(SE_SELECT); if (pssData->summary.unk7 != 0) { - sub_81C4204(2, 1); + SetSpriteInvisibility(2, 1); ClearWindowTilemap(13); schedule_bg_copy_tilemap_to_vram(0); sub_81C2074(0, 2); @@ -1559,7 +1559,7 @@ static void sub_81C0704(u8 taskId) data[1] = 0; break; case 8: - pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]); + pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &data[1]); if (pssData->spriteIds[0] == 0xFF) return; gSprites[pssData->spriteIds[0]].data[2] = 1; @@ -1567,7 +1567,7 @@ static void sub_81C0704(u8 taskId) data[1] = 0; break; case 9: - sub_81C4280(); + SetTypeIcons(); break; case 10: sub_81C25E8(); @@ -1677,7 +1677,7 @@ static void sub_81C0A8C(u8 taskId, s8 b) else SetTaskFuncWithFollowupFunc(taskId, sub_81C0CC4, gTasks[taskId].func); sub_81C2DE4(pssData->currPageIndex); - sub_81C424C(); + HidePageSpecificSprites(); } static void sub_81C0B8C(u8 taskId) @@ -1718,7 +1718,7 @@ static void sub_81C0C68(u8 taskId) data[0] = 0; sub_81C1BA0(); sub_81C2AFC(pssData->currPageIndex); - sub_81C4280(); + SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); } @@ -1767,7 +1767,7 @@ static void sub_81C0D44(u8 taskId) data[0] = 0; sub_81C1BA0(); sub_81C2AFC(pssData->currPageIndex); - sub_81C4280(); + SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); } @@ -1797,7 +1797,7 @@ static void sub_81C0E48(u8 taskId) sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); PrintMoveDetails(move); PrintNewMoveDetailsOrCancelText(); - sub_81C44F0(); + SetNewMoveTypeIcon(); schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); @@ -1883,7 +1883,7 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) if (move != 0) break; } - sub_81C240C(move); + DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); PrintMoveDetails(move); @@ -2003,7 +2003,7 @@ static void sub_81C13B0(u8 taskId, bool8 b) move = pssData->summary.moves[pssData->firstMoveIndex]; PrintMoveDetails(move); - sub_81C240C(move); + DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); gTasks[taskId].func = sub_81C0F44; @@ -2081,7 +2081,7 @@ static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2 static void sub_81C171C(u8 taskId) { - sub_81C44F0(); + SetNewMoveTypeIcon(); sub_81C4AF8(8); gTasks[taskId].func = sub_81C174C; } @@ -2415,7 +2415,7 @@ static void sub_81C1F80(u8 taskId) { if (pssData->currPageIndex == 3 && FuncIsActiveTask(sub_81C0B8C) == 0) PutWindowTilemap(15); - sub_81C240C(data[2]); + DrawContestMoveHearts(data[2]); } else { @@ -2566,7 +2566,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) schedule_bg_copy_tilemap_to_vram(2); } -static void sub_81C240C(u16 move) +static void DrawContestMoveHearts(u16 move) { u16 *tilemap = pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]; u8 i; @@ -3641,7 +3641,7 @@ static void PrintHMMovesCantBeForgotten(void) SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } -static void sub_81C4190(void) +static void ResetPssSpriteIds(void) { u8 i; @@ -3660,41 +3660,42 @@ static void DestroySpriteInArray(u8 spriteArrayId) } } -static void sub_81C4204(u8 spriteArrayId, bool8 invisible) +static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible) { gSprites[pssData->spriteIds[spriteArrayId]].invisible = invisible; } -static void sub_81C424C(void) +static void HidePageSpecificSprites(void) { +// Keeps Pokémon, caught ball and status sprites visible. u8 i; for (i = 3; i < 28; i++) { if (pssData->spriteIds[i] != 0xFF) - sub_81C4204(i, TRUE); + SetSpriteInvisibility(i, TRUE); } } -static void sub_81C4280(void) +static void SetTypeIcons(void) { switch (pssData->currPageIndex) { - case 0: - sub_81C43A0(); + case PSS_PAGE_INFO: + SetMonTypeIcons(); break; - case 2: - sub_81C4420(); - sub_81C44F0(); + case PSS_PAGE_BATTLE_MOVES: + SetMoveTypeIcons(); + SetNewMoveTypeIcon(); break; - case 3: - sub_81C4484(); - sub_81C44F0(); + case PSS_PAGE_CONTEST_MOVES: + SetContestMoveTypeIcons(); + SetNewMoveTypeIcon(); break; } } -static void sub_81C42C8(void) +static void CreateMoveTypeIcons(void) { u8 i; @@ -3703,7 +3704,7 @@ static void sub_81C42C8(void) if (pssData->spriteIds[i] == 0xFF) pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); - sub_81C4204(i, TRUE); + SetSpriteInvisibility(i, TRUE); } } @@ -3714,16 +3715,16 @@ static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId) sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId]; sprite->pos1.x = x + 16; sprite->pos1.y = y + 8; - sub_81C4204(spriteArrayId, FALSE); + SetSpriteInvisibility(spriteArrayId, FALSE); } -static void sub_81C43A0(void) +static void SetMonTypeIcons(void) { struct PokeSummary *summary = &pssData->summary; if (summary->isEgg) { SetMoveTypeSpritePosAndType(TYPE_MYSTERY, 120, 48, 3); - sub_81C4204(4, TRUE); + SetSpriteInvisibility(4, TRUE); } else { @@ -3731,16 +3732,16 @@ static void sub_81C43A0(void) if (gBaseStats[summary->species].type1 != gBaseStats[summary->species].type2) { SetMoveTypeSpritePosAndType(gBaseStats[summary->species].type2, 0xA0, 0x30, 4); - sub_81C4204(4, FALSE); + SetSpriteInvisibility(4, FALSE); } else { - sub_81C4204(4, TRUE); + SetSpriteInvisibility(4, TRUE); } } } -static void sub_81C4420(void) +static void SetMoveTypeIcons(void) { u8 i; struct PokeSummary *summary = &pssData->summary; @@ -3749,11 +3750,11 @@ static void sub_81C4420(void) if (summary->moves[i] != MOVE_NONE) SetMoveTypeSpritePosAndType(gBattleMoves[summary->moves[i]].type, 0x55, 0x20 + (i * 0x10), i + 3); else - sub_81C4204(i + 3, TRUE); + SetSpriteInvisibility(i + 3, TRUE); } } -static void sub_81C4484(void) +static void SetContestMoveTypeIcons(void) { u8 i; struct PokeSummary *summary = &pssData->summary; @@ -3762,15 +3763,15 @@ static void sub_81C4484(void) if (summary->moves[i] != MOVE_NONE) SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[summary->moves[i]].contestCategory, 0x55, 0x20 + (i * 0x10), i + 3); else - sub_81C4204(i + 3, TRUE); + SetSpriteInvisibility(i + 3, TRUE); } } -static void sub_81C44F0(void) +static void SetNewMoveTypeIcon(void) { if (pssData->newMove == MOVE_NONE) { - sub_81C4204(7, TRUE); + SetSpriteInvisibility(7, TRUE); } else { @@ -3800,7 +3801,7 @@ static void sub_81C4568(u8 a0, u8 a1) sprite2->animEnded = FALSE; } -static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1) +static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) { const struct CompressedSpritePalette *pal; struct PokeSummary *summary = &pssData->summary; @@ -4000,11 +4001,11 @@ static void CreateSetStatusSprite(void) if (anim != 0) { StartSpriteAnim(&gSprites[*spriteId], anim - 1); - sub_81C4204(2, FALSE); + SetSpriteInvisibility(2, FALSE); } else { - sub_81C4204(2, TRUE); + SetSpriteInvisibility(2, TRUE); } } From 82abc164dc9f6a74fdf0c535cc1621b7ed05318b Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 2 Feb 2019 14:22:41 -0500 Subject: [PATCH 38/42] convert mapjson.py to mapjson.cpp --- Makefile | 2 +- build_tools.sh | 1 + tools/mapjson/Makefile | 15 + tools/mapjson/json11.cpp | 786 ++++++++++++++++++++++++++++++++++++++ tools/mapjson/json11.h | 230 +++++++++++ tools/mapjson/mapjson.cpp | 528 +++++++++++++++++++++++++ tools/mapjson/mapjson.h | 31 ++ tools/mapjson/mapjson.py | 389 ------------------- 8 files changed, 1592 insertions(+), 390 deletions(-) create mode 100644 tools/mapjson/Makefile create mode 100644 tools/mapjson/json11.cpp create mode 100644 tools/mapjson/json11.h create mode 100644 tools/mapjson/mapjson.cpp create mode 100644 tools/mapjson/mapjson.h delete mode 100755 tools/mapjson/mapjson.py diff --git a/Makefile b/Makefile index cb9ce27bb9..70e1ceca32 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE) PREPROC := tools/preproc/preproc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) FIX := tools/gbafix/gbafix$(EXE) -MAPJSON := python tools/mapjson/mapjson.py +MAPJSON := tools/mapjson/mapjson$(EXE) # Clear the default suffixes .SUFFIXES: diff --git a/build_tools.sh b/build_tools.sh index d9eebf05c6..429a9cef00 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -8,3 +8,4 @@ make -C tools/aif2pcm CXX=${1:-g++} make -C tools/ramscrgen CXX=${1:-g++} make -C tools/gbafix CXX=${1:-g++} make -C tools/mid2agb CXX=${1:-g++} +make -C tools/mapjson CXX=${1:-g++} diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile new file mode 100644 index 0000000000..d09acad502 --- /dev/null +++ b/tools/mapjson/Makefile @@ -0,0 +1,15 @@ +CXX := g++ + +CXXFLAGS := -Wall -std=c++11 -O2 + +SRCS := json11.cpp mapjson.cpp + +HEADERS := mapjson.h + +.PHONY: clean + +mapjson: $(SRCS) $(HEADERS) + $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) mapjson mapjson.exe diff --git a/tools/mapjson/json11.cpp b/tools/mapjson/json11.cpp new file mode 100644 index 0000000000..1da530206b --- /dev/null +++ b/tools/mapjson/json11.cpp @@ -0,0 +1,786 @@ +/* Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "json11.h" +#include +#include +#include +#include +#include + +namespace json11 { + +static const int max_depth = 200; + +using std::string; +using std::vector; +using std::map; +using std::make_shared; +using std::initializer_list; +using std::move; + +/* Helper for representing null - just a do-nothing struct, plus comparison + * operators so the helpers in JsonValue work. We can't use nullptr_t because + * it may not be orderable. + */ +struct NullStruct { + bool operator==(NullStruct) const { return true; } + bool operator<(NullStruct) const { return false; } +}; + +/* * * * * * * * * * * * * * * * * * * * + * Serialization + */ + +static void dump(NullStruct, string &out) { + out += "null"; +} + +static void dump(double value, string &out) { + if (std::isfinite(value)) { + char buf[32]; + snprintf(buf, sizeof buf, "%.17g", value); + out += buf; + } else { + out += "null"; + } +} + +static void dump(int value, string &out) { + char buf[32]; + snprintf(buf, sizeof buf, "%d", value); + out += buf; +} + +static void dump(bool value, string &out) { + out += value ? "true" : "false"; +} + +static void dump(const string &value, string &out) { + out += '"'; + for (size_t i = 0; i < value.length(); i++) { + const char ch = value[i]; + if (ch == '\\') { + out += "\\\\"; + } else if (ch == '"') { + out += "\\\""; + } else if (ch == '\b') { + out += "\\b"; + } else if (ch == '\f') { + out += "\\f"; + } else if (ch == '\n') { + out += "\\n"; + } else if (ch == '\r') { + out += "\\r"; + } else if (ch == '\t') { + out += "\\t"; + } else if (static_cast(ch) <= 0x1f) { + char buf[8]; + snprintf(buf, sizeof buf, "\\u%04x", ch); + out += buf; + } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 + && static_cast(value[i+2]) == 0xa8) { + out += "\\u2028"; + i += 2; + } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 + && static_cast(value[i+2]) == 0xa9) { + out += "\\u2029"; + i += 2; + } else { + out += ch; + } + } + out += '"'; +} + +static void dump(const Json::array &values, string &out) { + bool first = true; + out += "["; + for (const auto &value : values) { + if (!first) + out += ", "; + value.dump(out); + first = false; + } + out += "]"; +} + +static void dump(const Json::object &values, string &out) { + bool first = true; + out += "{"; + for (const auto &kv : values) { + if (!first) + out += ", "; + dump(kv.first, out); + out += ": "; + kv.second.dump(out); + first = false; + } + out += "}"; +} + +void Json::dump(string &out) const { + m_ptr->dump(out); +} + +/* * * * * * * * * * * * * * * * * * * * + * Value wrappers + */ + +template +class Value : public JsonValue { +protected: + + // Constructors + explicit Value(const T &value) : m_value(value) {} + explicit Value(T &&value) : m_value(move(value)) {} + + // Get type tag + Json::Type type() const override { + return tag; + } + + // Comparisons + bool equals(const JsonValue * other) const override { + return m_value == static_cast *>(other)->m_value; + } + bool less(const JsonValue * other) const override { + return m_value < static_cast *>(other)->m_value; + } + + const T m_value; + void dump(string &out) const override { json11::dump(m_value, out); } +}; + +class JsonDouble final : public Value { + double number_value() const override { return m_value; } + int int_value() const override { return static_cast(m_value); } + bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } + bool less(const JsonValue * other) const override { return m_value < other->number_value(); } +public: + explicit JsonDouble(double value) : Value(value) {} +}; + +class JsonInt final : public Value { + double number_value() const override { return m_value; } + int int_value() const override { return m_value; } + bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } + bool less(const JsonValue * other) const override { return m_value < other->number_value(); } +public: + explicit JsonInt(int value) : Value(value) {} +}; + +class JsonBoolean final : public Value { + bool bool_value() const override { return m_value; } +public: + explicit JsonBoolean(bool value) : Value(value) {} +}; + +class JsonString final : public Value { + const string &string_value() const override { return m_value; } +public: + explicit JsonString(const string &value) : Value(value) {} + explicit JsonString(string &&value) : Value(move(value)) {} +}; + +class JsonArray final : public Value { + const Json::array &array_items() const override { return m_value; } + const Json & operator[](size_t i) const override; +public: + explicit JsonArray(const Json::array &value) : Value(value) {} + explicit JsonArray(Json::array &&value) : Value(move(value)) {} +}; + +class JsonObject final : public Value { + const Json::object &object_items() const override { return m_value; } + const Json & operator[](const string &key) const override; +public: + explicit JsonObject(const Json::object &value) : Value(value) {} + explicit JsonObject(Json::object &&value) : Value(move(value)) {} +}; + +class JsonNull final : public Value { +public: + JsonNull() : Value({}) {} +}; + +/* * * * * * * * * * * * * * * * * * * * + * Static globals - static-init-safe + */ +struct Statics { + const std::shared_ptr null = make_shared(); + const std::shared_ptr t = make_shared(true); + const std::shared_ptr f = make_shared(false); + const string empty_string; + const vector empty_vector; + const map empty_map; + Statics() {} +}; + +static const Statics & statics() { + static const Statics s {}; + return s; +} + +static const Json & static_null() { + // This has to be separate, not in Statics, because Json() accesses statics().null. + static const Json json_null; + return json_null; +} + +/* * * * * * * * * * * * * * * * * * * * + * Constructors + */ + +Json::Json() noexcept : m_ptr(statics().null) {} +Json::Json(std::nullptr_t) noexcept : m_ptr(statics().null) {} +Json::Json(double value) : m_ptr(make_shared(value)) {} +Json::Json(int value) : m_ptr(make_shared(value)) {} +Json::Json(bool value) : m_ptr(value ? statics().t : statics().f) {} +Json::Json(const string &value) : m_ptr(make_shared(value)) {} +Json::Json(string &&value) : m_ptr(make_shared(move(value))) {} +Json::Json(const char * value) : m_ptr(make_shared(value)) {} +Json::Json(const Json::array &values) : m_ptr(make_shared(values)) {} +Json::Json(Json::array &&values) : m_ptr(make_shared(move(values))) {} +Json::Json(const Json::object &values) : m_ptr(make_shared(values)) {} +Json::Json(Json::object &&values) : m_ptr(make_shared(move(values))) {} + +/* * * * * * * * * * * * * * * * * * * * + * Accessors + */ + +Json::Type Json::type() const { return m_ptr->type(); } +double Json::number_value() const { return m_ptr->number_value(); } +int Json::int_value() const { return m_ptr->int_value(); } +bool Json::bool_value() const { return m_ptr->bool_value(); } +const string & Json::string_value() const { return m_ptr->string_value(); } +const vector & Json::array_items() const { return m_ptr->array_items(); } +const map & Json::object_items() const { return m_ptr->object_items(); } +const Json & Json::operator[] (size_t i) const { return (*m_ptr)[i]; } +const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key]; } + +double JsonValue::number_value() const { return 0; } +int JsonValue::int_value() const { return 0; } +bool JsonValue::bool_value() const { return false; } +const string & JsonValue::string_value() const { return statics().empty_string; } +const vector & JsonValue::array_items() const { return statics().empty_vector; } +const map & JsonValue::object_items() const { return statics().empty_map; } +const Json & JsonValue::operator[] (size_t) const { return static_null(); } +const Json & JsonValue::operator[] (const string &) const { return static_null(); } + +const Json & JsonObject::operator[] (const string &key) const { + auto iter = m_value.find(key); + return (iter == m_value.end()) ? static_null() : iter->second; +} +const Json & JsonArray::operator[] (size_t i) const { + if (i >= m_value.size()) return static_null(); + else return m_value[i]; +} + +/* * * * * * * * * * * * * * * * * * * * + * Comparison + */ + +bool Json::operator== (const Json &other) const { + if (m_ptr == other.m_ptr) + return true; + if (m_ptr->type() != other.m_ptr->type()) + return false; + + return m_ptr->equals(other.m_ptr.get()); +} + +bool Json::operator< (const Json &other) const { + if (m_ptr == other.m_ptr) + return false; + if (m_ptr->type() != other.m_ptr->type()) + return m_ptr->type() < other.m_ptr->type(); + + return m_ptr->less(other.m_ptr.get()); +} + +/* * * * * * * * * * * * * * * * * * * * + * Parsing + */ + +/* esc(c) + * + * Format char c suitable for printing in an error message. + */ +static inline string esc(char c) { + char buf[12]; + if (static_cast(c) >= 0x20 && static_cast(c) <= 0x7f) { + snprintf(buf, sizeof buf, "'%c' (%d)", c, c); + } else { + snprintf(buf, sizeof buf, "(%d)", c); + } + return string(buf); +} + +static inline bool in_range(long x, long lower, long upper) { + return (x >= lower && x <= upper); +} + +namespace { +/* JsonParser + * + * Object that tracks all state of an in-progress parse. + */ +struct JsonParser final { + + /* State + */ + const string &str; + size_t i; + string &err; + bool failed; + const JsonParse strategy; + + /* fail(msg, err_ret = Json()) + * + * Mark this parse as failed. + */ + Json fail(string &&msg) { + return fail(move(msg), Json()); + } + + template + T fail(string &&msg, const T err_ret) { + if (!failed) + err = std::move(msg); + failed = true; + return err_ret; + } + + /* consume_whitespace() + * + * Advance until the current character is non-whitespace. + */ + void consume_whitespace() { + while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t') + i++; + } + + /* consume_comment() + * + * Advance comments (c-style inline and multiline). + */ + bool consume_comment() { + bool comment_found = false; + if (str[i] == '/') { + i++; + if (i == str.size()) + return fail("unexpected end of input after start of comment", false); + if (str[i] == '/') { // inline comment + i++; + // advance until next line, or end of input + while (i < str.size() && str[i] != '\n') { + i++; + } + comment_found = true; + } + else if (str[i] == '*') { // multiline comment + i++; + if (i > str.size()-2) + return fail("unexpected end of input inside multi-line comment", false); + // advance until closing tokens + while (!(str[i] == '*' && str[i+1] == '/')) { + i++; + if (i > str.size()-2) + return fail( + "unexpected end of input inside multi-line comment", false); + } + i += 2; + comment_found = true; + } + else + return fail("malformed comment", false); + } + return comment_found; + } + + /* consume_garbage() + * + * Advance until the current character is non-whitespace and non-comment. + */ + void consume_garbage() { + consume_whitespace(); + if(strategy == JsonParse::COMMENTS) { + bool comment_found = false; + do { + comment_found = consume_comment(); + if (failed) return; + consume_whitespace(); + } + while(comment_found); + } + } + + /* get_next_token() + * + * Return the next non-whitespace character. If the end of the input is reached, + * flag an error and return 0. + */ + char get_next_token() { + consume_garbage(); + if (failed) return static_cast(0); + if (i == str.size()) + return fail("unexpected end of input", static_cast(0)); + + return str[i++]; + } + + /* encode_utf8(pt, out) + * + * Encode pt as UTF-8 and add it to out. + */ + void encode_utf8(long pt, string & out) { + if (pt < 0) + return; + + if (pt < 0x80) { + out += static_cast(pt); + } else if (pt < 0x800) { + out += static_cast((pt >> 6) | 0xC0); + out += static_cast((pt & 0x3F) | 0x80); + } else if (pt < 0x10000) { + out += static_cast((pt >> 12) | 0xE0); + out += static_cast(((pt >> 6) & 0x3F) | 0x80); + out += static_cast((pt & 0x3F) | 0x80); + } else { + out += static_cast((pt >> 18) | 0xF0); + out += static_cast(((pt >> 12) & 0x3F) | 0x80); + out += static_cast(((pt >> 6) & 0x3F) | 0x80); + out += static_cast((pt & 0x3F) | 0x80); + } + } + + /* parse_string() + * + * Parse a string, starting at the current position. + */ + string parse_string() { + string out; + long last_escaped_codepoint = -1; + while (true) { + if (i == str.size()) + return fail("unexpected end of input in string", ""); + + char ch = str[i++]; + + if (ch == '"') { + encode_utf8(last_escaped_codepoint, out); + return out; + } + + if (in_range(ch, 0, 0x1f)) + return fail("unescaped " + esc(ch) + " in string", ""); + + // The usual case: non-escaped characters + if (ch != '\\') { + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = -1; + out += ch; + continue; + } + + // Handle escapes + if (i == str.size()) + return fail("unexpected end of input in string", ""); + + ch = str[i++]; + + if (ch == 'u') { + // Extract 4-byte escape sequence + string esc = str.substr(i, 4); + // Explicitly check length of the substring. The following loop + // relies on std::string returning the terminating NUL when + // accessing str[length]. Checking here reduces brittleness. + if (esc.length() < 4) { + return fail("bad \\u escape: " + esc, ""); + } + for (size_t j = 0; j < 4; j++) { + if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F') + && !in_range(esc[j], '0', '9')) + return fail("bad \\u escape: " + esc, ""); + } + + long codepoint = strtol(esc.data(), nullptr, 16); + + // JSON specifies that characters outside the BMP shall be encoded as a pair + // of 4-hex-digit \u escapes encoding their surrogate pair components. Check + // whether we're in the middle of such a beast: the previous codepoint was an + // escaped lead (high) surrogate, and this is a trail (low) surrogate. + if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF) + && in_range(codepoint, 0xDC00, 0xDFFF)) { + // Reassemble the two surrogate pairs into one astral-plane character, per + // the UTF-16 algorithm. + encode_utf8((((last_escaped_codepoint - 0xD800) << 10) + | (codepoint - 0xDC00)) + 0x10000, out); + last_escaped_codepoint = -1; + } else { + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = codepoint; + } + + i += 4; + continue; + } + + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = -1; + + if (ch == 'b') { + out += '\b'; + } else if (ch == 'f') { + out += '\f'; + } else if (ch == 'n') { + out += '\n'; + } else if (ch == 'r') { + out += '\r'; + } else if (ch == 't') { + out += '\t'; + } else if (ch == '"' || ch == '\\' || ch == '/') { + out += ch; + } else { + return fail("invalid escape character " + esc(ch), ""); + } + } + } + + /* parse_number() + * + * Parse a double. + */ + Json parse_number() { + size_t start_pos = i; + + if (str[i] == '-') + i++; + + // Integer part + if (str[i] == '0') { + i++; + if (in_range(str[i], '0', '9')) + return fail("leading 0s not permitted in numbers"); + } else if (in_range(str[i], '1', '9')) { + i++; + while (in_range(str[i], '0', '9')) + i++; + } else { + return fail("invalid " + esc(str[i]) + " in number"); + } + + if (str[i] != '.' && str[i] != 'e' && str[i] != 'E' + && (i - start_pos) <= static_cast(std::numeric_limits::digits10)) { + return std::atoi(str.c_str() + start_pos); + } + + // Decimal part + if (str[i] == '.') { + i++; + if (!in_range(str[i], '0', '9')) + return fail("at least one digit required in fractional part"); + + while (in_range(str[i], '0', '9')) + i++; + } + + // Exponent part + if (str[i] == 'e' || str[i] == 'E') { + i++; + + if (str[i] == '+' || str[i] == '-') + i++; + + if (!in_range(str[i], '0', '9')) + return fail("at least one digit required in exponent"); + + while (in_range(str[i], '0', '9')) + i++; + } + + return std::strtod(str.c_str() + start_pos, nullptr); + } + + /* expect(str, res) + * + * Expect that 'str' starts at the character that was just read. If it does, advance + * the input and return res. If not, flag an error. + */ + Json expect(const string &expected, Json res) { + assert(i != 0); + i--; + if (str.compare(i, expected.length(), expected) == 0) { + i += expected.length(); + return res; + } else { + return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length())); + } + } + + /* parse_json() + * + * Parse a JSON object. + */ + Json parse_json(int depth) { + if (depth > max_depth) { + return fail("exceeded maximum nesting depth"); + } + + char ch = get_next_token(); + if (failed) + return Json(); + + if (ch == '-' || (ch >= '0' && ch <= '9')) { + i--; + return parse_number(); + } + + if (ch == 't') + return expect("true", true); + + if (ch == 'f') + return expect("false", false); + + if (ch == 'n') + return expect("null", Json()); + + if (ch == '"') + return parse_string(); + + if (ch == '{') { + map data; + ch = get_next_token(); + if (ch == '}') + return data; + + while (1) { + if (ch != '"') + return fail("expected '\"' in object, got " + esc(ch)); + + string key = parse_string(); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch != ':') + return fail("expected ':' in object, got " + esc(ch)); + + data[std::move(key)] = parse_json(depth + 1); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch == '}') + break; + if (ch != ',') + return fail("expected ',' in object, got " + esc(ch)); + + ch = get_next_token(); + } + return data; + } + + if (ch == '[') { + vector data; + ch = get_next_token(); + if (ch == ']') + return data; + + while (1) { + i--; + data.push_back(parse_json(depth + 1)); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch == ']') + break; + if (ch != ',') + return fail("expected ',' in list, got " + esc(ch)); + + ch = get_next_token(); + (void)ch; + } + return data; + } + + return fail("expected value, got " + esc(ch)); + } +}; +}//namespace { + +Json Json::parse(const string &in, string &err, JsonParse strategy) { + JsonParser parser { in, 0, err, false, strategy }; + Json result = parser.parse_json(0); + + // Check for any trailing garbage + parser.consume_garbage(); + if (parser.failed) + return Json(); + if (parser.i != in.size()) + return parser.fail("unexpected trailing " + esc(in[parser.i])); + + return result; +} + +// Documented in json11.hpp +vector Json::parse_multi(const string &in, + std::string::size_type &parser_stop_pos, + string &err, + JsonParse strategy) { + JsonParser parser { in, 0, err, false, strategy }; + parser_stop_pos = 0; + vector json_vec; + while (parser.i != in.size() && !parser.failed) { + json_vec.push_back(parser.parse_json(0)); + if (parser.failed) + break; + + // Check for another object + parser.consume_garbage(); + if (parser.failed) + break; + parser_stop_pos = parser.i; + } + return json_vec; +} + +/* * * * * * * * * * * * * * * * * * * * + * Shape-checking + */ + +bool Json::has_shape(const shape & types, string & err) const { + if (!is_object()) { + err = "expected JSON object, got " + dump(); + return false; + } + + for (auto & item : types) { + if ((*this)[item.first].type() != item.second) { + err = "bad type for " + item.first + " in " + dump(); + return false; + } + } + + return true; +} + +} // namespace json11 diff --git a/tools/mapjson/json11.h b/tools/mapjson/json11.h new file mode 100644 index 0000000000..c04c4362f9 --- /dev/null +++ b/tools/mapjson/json11.h @@ -0,0 +1,230 @@ +/* json11 + * + * json11 is a tiny JSON library for C++11, providing JSON parsing and serialization. + * + * The core object provided by the library is json11::Json. A Json object represents any JSON + * value: null, bool, number (int or double), string (std::string), array (std::vector), or + * object (std::map). + * + * Json objects act like values: they can be assigned, copied, moved, compared for equality or + * order, etc. There are also helper methods Json::dump, to serialize a Json to a string, and + * Json::parse (static) to parse a std::string as a Json object. + * + * Internally, the various types of Json object are represented by the JsonValue class + * hierarchy. + * + * A note on numbers - JSON specifies the syntax of number formatting but not its semantics, + * so some JSON implementations distinguish between integers and floating-point numbers, while + * some don't. In json11, we choose the latter. Because some JSON implementations (namely + * Javascript itself) treat all numbers as the same type, distinguishing the two leads + * to JSON that will be *silently* changed by a round-trip through those implementations. + * Dangerous! To avoid that risk, json11 stores all numbers as double internally, but also + * provides integer helpers. + * + * Fortunately, double-precision IEEE754 ('double') can precisely store any integer in the + * range +/-2^53, which includes every 'int' on most systems. (Timestamps often use int64 + * or long long to avoid the Y2038K problem; a double storing microseconds since some epoch + * will be exact for +/- 275 years.) + */ + +/* Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +#include +#include +#include +#include +#include + +#ifdef _MSC_VER + #if _MSC_VER <= 1800 // VS 2013 + #ifndef noexcept + #define noexcept throw() + #endif + + #ifndef snprintf + #define snprintf _snprintf_s + #endif + #endif +#endif + +namespace json11 { + +enum JsonParse { + STANDARD, COMMENTS +}; + +class JsonValue; + +class Json final { +public: + // Types + enum Type { + NUL, NUMBER, BOOL, STRING, ARRAY, OBJECT + }; + + // Array and object typedefs + typedef std::vector array; + typedef std::map object; + + // Constructors for the various types of JSON value. + Json() noexcept; // NUL + Json(std::nullptr_t) noexcept; // NUL + Json(double value); // NUMBER + Json(int value); // NUMBER + Json(bool value); // BOOL + Json(const std::string &value); // STRING + Json(std::string &&value); // STRING + Json(const char * value); // STRING + Json(const array &values); // ARRAY + Json(array &&values); // ARRAY + Json(const object &values); // OBJECT + Json(object &&values); // OBJECT + + // Implicit constructor: anything with a to_json() function. + template + Json(const T & t) : Json(t.to_json()) {} + + // Implicit constructor: map-like objects (std::map, std::unordered_map, etc) + template ().begin()->first)>::value + && std::is_constructible().begin()->second)>::value, + int>::type = 0> + Json(const M & m) : Json(object(m.begin(), m.end())) {} + + // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc) + template ().begin())>::value, + int>::type = 0> + Json(const V & v) : Json(array(v.begin(), v.end())) {} + + // This prevents Json(some_pointer) from accidentally producing a bool. Use + // Json(bool(some_pointer)) if that behavior is desired. + Json(void *) = delete; + + // Accessors + Type type() const; + + bool is_null() const { return type() == NUL; } + bool is_number() const { return type() == NUMBER; } + bool is_bool() const { return type() == BOOL; } + bool is_string() const { return type() == STRING; } + bool is_array() const { return type() == ARRAY; } + bool is_object() const { return type() == OBJECT; } + + // Return the enclosed value if this is a number, 0 otherwise. Note that json11 does not + // distinguish between integer and non-integer numbers - number_value() and int_value() + // can both be applied to a NUMBER-typed object. + double number_value() const; + int int_value() const; + + // Return the enclosed value if this is a boolean, false otherwise. + bool bool_value() const; + // Return the enclosed string if this is a string, "" otherwise. + const std::string &string_value() const; + // Return the enclosed std::vector if this is an array, or an empty vector otherwise. + const array &array_items() const; + // Return the enclosed std::map if this is an object, or an empty map otherwise. + const object &object_items() const; + + // Return a reference to arr[i] if this is an array, Json() otherwise. + const Json & operator[](size_t i) const; + // Return a reference to obj[key] if this is an object, Json() otherwise. + const Json & operator[](const std::string &key) const; + + // Serialize. + void dump(std::string &out) const; + std::string dump() const { + std::string out; + dump(out); + return out; + } + + // Parse. If parse fails, return Json() and assign an error message to err. + static Json parse(const std::string & in, + std::string & err, + JsonParse strategy = JsonParse::STANDARD); + static Json parse(const char * in, + std::string & err, + JsonParse strategy = JsonParse::STANDARD) { + if (in) { + return parse(std::string(in), err, strategy); + } else { + err = "null input"; + return nullptr; + } + } + // Parse multiple objects, concatenated or separated by whitespace + static std::vector parse_multi( + const std::string & in, + std::string::size_type & parser_stop_pos, + std::string & err, + JsonParse strategy = JsonParse::STANDARD); + + static inline std::vector parse_multi( + const std::string & in, + std::string & err, + JsonParse strategy = JsonParse::STANDARD) { + std::string::size_type parser_stop_pos; + return parse_multi(in, parser_stop_pos, err, strategy); + } + + bool operator== (const Json &rhs) const; + bool operator< (const Json &rhs) const; + bool operator!= (const Json &rhs) const { return !(*this == rhs); } + bool operator<= (const Json &rhs) const { return !(rhs < *this); } + bool operator> (const Json &rhs) const { return (rhs < *this); } + bool operator>= (const Json &rhs) const { return !(*this < rhs); } + + /* has_shape(types, err) + * + * Return true if this is a JSON object and, for each item in types, has a field of + * the given type. If not, return false and set err to a descriptive message. + */ + typedef std::initializer_list> shape; + bool has_shape(const shape & types, std::string & err) const; + +private: + std::shared_ptr m_ptr; +}; + +// Internal class hierarchy - JsonValue objects are not exposed to users of this API. +class JsonValue { +protected: + friend class Json; + friend class JsonInt; + friend class JsonDouble; + virtual Json::Type type() const = 0; + virtual bool equals(const JsonValue * other) const = 0; + virtual bool less(const JsonValue * other) const = 0; + virtual void dump(std::string &out) const = 0; + virtual double number_value() const; + virtual int int_value() const; + virtual bool bool_value() const; + virtual const std::string &string_value() const; + virtual const Json::array &array_items() const; + virtual const Json &operator[](size_t i) const; + virtual const Json::object &object_items() const; + virtual const Json &operator[](const std::string &key) const; + virtual ~JsonValue() {} +}; + +} // namespace json11 diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp new file mode 100644 index 0000000000..e1e86b5c5f --- /dev/null +++ b/tools/mapjson/mapjson.cpp @@ -0,0 +1,528 @@ +// mapjson.cpp + +#include +using std::cout; using std::endl; + +#include +using std::string; + +#include +using std::vector; + +#include +using std::sort; using std::find; + +#include +using std::map; + +#include +using std::ofstream; using std::ifstream; + +#include +using std::ostringstream; + +#include +using std::numeric_limits; + +#include "json11.h" +using json11::Json; + +#include "mapjson.h" + + +string read_text_file(string filepath) { + ifstream in_file(filepath); + + if (!in_file.is_open()) + FATAL_ERROR("Cannot open file %s for reading.\n", filepath.c_str()); + + string text; + + in_file.seekg(0, std::ios::end); + text.resize(in_file.tellg()); + + in_file.seekg(0, std::ios::beg); + in_file.read(&text[0], text.size()); + + in_file.close(); + + return text; +} + +void write_text_file(string filepath, string text) { + ofstream out_file(filepath); + + if (!out_file.is_open()) + FATAL_ERROR("Cannot open file %s for writing.\n", filepath.c_str()); + + out_file << text; + + out_file.close(); +} + +string generate_map_header_text(Json map_data, Json layouts_data) { + string map_layout_id = map_data["layout"].string_value(); + + vector matched; + + for (auto &field : layouts_data["layouts"].array_items()) { + if (map_layout_id == field["id"].string_value()) + matched.push_back(field); + } + + if (matched.size() != 1) + FATAL_ERROR("Failed to find matching layout for %s.\n", map_layout_id.c_str()); + + Json layout = matched[0]; + + ostringstream text; + + text << map_data["name"].string_value() << ":\n" + << "\t.4byte " << layout["name"].string_value() << "\n"; + + if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) + text << "\t.4byte " << map_data["shared_events_map"].string_value() << "_MapEvents\n"; + else + text << "\t.4byte " << map_data["name"].string_value() << "_MapEvents\n"; + + if (map_data.object_items().find("shared_scripts_map") != map_data.object_items().end()) + text << "\t.4byte " << map_data["shared_scripts_map"].string_value() << "_MapScripts\n"; + else + text << "\t.4byte " << map_data["name"].string_value() << "_MapScripts\n"; + + if (map_data.object_items().find("connections") != map_data.object_items().end() + && map_data["connections"].array_items().size() > 0) + text << "\t.4byte " << map_data["name"].string_value() << "_MapConnections\n"; + else + text << "\t.4byte 0x0\n"; + + text << "\t.2byte " << map_data["music"].string_value() << "\n" + << "\t.2byte " << layout["id"].string_value() << "\n" + << "\t.byte " << map_data["region_map_section"].string_value() << "\n" + << "\t.byte " << map_data["requires_flash"].bool_value() << "\n" + << "\t.byte " << map_data["weather"].string_value() << "\n" + << "\t.byte " << map_data["map_type"].string_value() << "\n" + << "\t.2byte 0\n\t" + << "map_header_flags " + << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " + << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " + << "allow_run=" << map_data["allow_running"].bool_value() << ", " + << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n" + << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; + + return text.str(); +} + +string generate_map_connections_text(Json map_data) { + if (map_data["connections"] == Json()) + return string("\n"); + + ostringstream text; + + text << map_data["name"].string_value() << "_MapConnectionsList:\n"; + + for (auto &connection : map_data["connections"].array_items()) { + text << "\tconnection " + << connection["direction"].string_value() << ", " + << connection["offset"].int_value() << ", " + << connection["map"].string_value() << "\n"; + } + + text << "\n" << map_data["name"].string_value() << "_MapConnections:\n" + << "\t.4byte " << map_data["connections"].array_items().size() << "\n" + << "\t.4byte " << map_data["name"].string_value() << "_MapConnectionsList\n\n"; + + return text.str(); +} + +string generate_map_events_text(Json map_data) { + if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) + return string("\n"); + + ostringstream text; + + string objects_label, warps_label, coords_label, bgs_label; + + if (map_data["object_events"].array_items().size() > 0) { + objects_label = map_data["name"].string_value() + "_EventObjects"; + text << objects_label << ":\n"; + for (int i = 0; i < map_data["object_events"].array_items().size(); i++) { + auto obj_event = map_data["object_events"].array_items()[i]; + text << "\tobject_event " << i + 1 << ", " + << obj_event["graphics_id"].string_value() << ", 0, " + << obj_event["x"].int_value() << ", " + << obj_event["y"].int_value() << ", " + << obj_event["elevation"].int_value() << ", " + << obj_event["movement_type"].string_value() << ", " + << obj_event["movement_range_x"].int_value() << ", " + << obj_event["movement_range_y"].int_value() << ", " + << obj_event["trainer_type"].int_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].int_value() << ", " + << obj_event["script"].string_value() << ", " + << obj_event["flag"].string_value() << "\n"; + } + text << "\n"; + } else { + objects_label = "0x0"; + } + + if (map_data["warp_events"].array_items().size() > 0) { + warps_label = map_data["name"].string_value() + "_MapWarps"; + text << warps_label << ":\n"; + for (auto &warp_event : map_data["warp_events"].array_items()) { + text << "\twarp_def " + << warp_event["x"].int_value() << ", " + << warp_event["y"].int_value() << ", " + << warp_event["elevation"].int_value() << ", " + << warp_event["dest_warp_id"].int_value() << ", " + << warp_event["dest_map"].string_value() << "\n"; + } + text << "\n"; + } else { + warps_label = "0x0"; + } + + if (map_data["coord_events"].array_items().size() > 0) { + coords_label = map_data["name"].string_value() + "_MapCoordEvents"; + text << coords_label << ":\n"; + for (auto &coord_event : map_data["coord_events"].array_items()) { + if (coord_event["type"].string_value() == "trigger") { + text << "\tcoord_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", " + << coord_event["var"].string_value() << ", " + << coord_event["var_value"].int_value() << ", " + << coord_event["script"].string_value() << "\n"; + } + else if (coord_event["type"] == "weather") { + text << "\tcoord_weather_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", " + << coord_event["weather"].string_value() << "\n"; + } + } + text << "\n"; + } else { + coords_label = "0x0"; + } + + if (map_data["bg_events"].array_items().size() > 0) { + bgs_label = map_data["name"].string_value() + "_MapBGEvents"; + text << bgs_label << ":\n"; + for (auto &bg_event : map_data["bg_events"].array_items()) { + if (bg_event["type"] == "sign") { + text << "\tbg_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["player_facing_dir"].string_value() << ", " + << bg_event["script"].string_value() << "\n"; + } + else if (bg_event["type"] == "hidden_item") { + text << "\tbg_hidden_item_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["item"].string_value() << ", " + << bg_event["flag"].string_value() << "\n"; + } + else if (bg_event["type"] == "secret_base") { + text << "\tbg_secret_base_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["secret_base_id"].string_value() << "\n"; + } + } + text << "\n"; + } else { + bgs_label = "0x0"; + } + + text << map_data["name"].string_value() << "_MapEvents::\n" + << "\tmap_events " << objects_label << ", " << warps_label << ", " + << coords_label << ", " << bgs_label << "\n\n"; + + return text.str(); +} + +string get_directory_name(string filename) { + size_t dir_pos = filename.find_last_of("/\\"); + + return filename.substr(0, dir_pos + 1); +} + +void process_map(string map_filepath, string layouts_filepath) { + string mapdata_err, layouts_err; + + string mapdata_json_text = read_text_file(map_filepath); + string layouts_json_text = read_text_file(layouts_filepath); + + Json map_data = Json::parse(mapdata_json_text, mapdata_err); + if (map_data == Json()) + FATAL_ERROR("%s\n", mapdata_err.c_str()); + + Json layouts_data = Json::parse(layouts_json_text, layouts_err); + if (layouts_data == Json()) + FATAL_ERROR("%s\n", layouts_err.c_str()); + + string header_text = generate_map_header_text(map_data, layouts_data); + string events_text = generate_map_events_text(map_data); + string connections_text = generate_map_connections_text(map_data); + + string files_dir = get_directory_name(map_filepath); + write_text_file(files_dir + "header.inc", header_text); + write_text_file(files_dir + "events.inc", events_text); + write_text_file(files_dir + "connections.inc", connections_text); +} + +string generate_groups_text(Json groups_data) { + ostringstream text; + + for (auto &key : groups_data["group_order"].array_items()) { + string group = key.string_value(); + text << group << "::\n"; + auto maps = groups_data[group].array_items(); + for (Json &map_name : maps) + text << "\t.4byte " << map_name.string_value() << "\n"; + text << "\n"; + } + + text << "\t.align 2\n" << "gMapGroups::\n"; + for (auto &group : groups_data["group_order"].array_items()) + text << "\t.4byte " << group.string_value() << "\n"; + text << "\n"; + + return text.str(); +} + +string generate_connections_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name); + + vector connections_include_order = groups_data["connections_include_order"].array_items(); + + if (connections_include_order.size() > 0) + sort(map_names.begin(), map_names.end(), [connections_include_order](const Json &a, const Json &b) { + auto iter_a = find(connections_include_order.begin(), connections_include_order.end(), a); + if (iter_a == connections_include_order.end()) + iter_a = connections_include_order.begin() + numeric_limits::max(); + auto iter_b = find(connections_include_order.begin(), connections_include_order.end(), b); + if (iter_b == connections_include_order.end()) + iter_b = connections_include_order.begin() + numeric_limits::max(); + return iter_a < iter_b; + }); + + ostringstream text; + + for (Json map_name : map_names) + text << "\t.include \"data/maps/" << map_name.string_value() << "/connections.inc\"\n"; + + return text.str(); +} + +string generate_headers_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name.string_value()); + + ostringstream text; + + for (string map_name : map_names) + text << "\t.include \"data/maps/" << map_name << "/header.inc\"\n"; + + return text.str(); +} + +string generate_events_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name.string_value()); + + ostringstream text; + + for (string map_name : map_names) + text << "\t.include \"data/maps/" << map_name << "/events.inc\"\n"; + + return text.str(); +} + +string generate_map_constants_text(string groups_filepath, Json groups_data) { + string file_dir = get_directory_name(groups_filepath); + char dir_separator = file_dir.back(); + + ostringstream text; + + text << "#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n" + << "#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n"; + + int group_num = 0; + + for (auto &group : groups_data["group_order"].array_items()) { + text << "// Map Group " << group_num << "\n"; + vector map_ids; + size_t max_length = 0; + + for (auto &map_name : groups_data[group.string_value()].array_items()) { + string header_filepath = file_dir + map_name.string_value() + dir_separator + "map.json"; + string err_str; + Json map_data = Json::parse(read_text_file(header_filepath), err_str); + map_ids.push_back(map_data["id"]); + if (map_data["id"].string_value().length() > max_length) + max_length = map_data["id"].string_value().length(); + } + + int map_id_num = 0; + for (Json map_id : map_ids) { + text << "#define " << map_id.string_value() << string((max_length - map_id.string_value().length() + 1), ' ') + << "(" << map_id_num++ << " | (" << group_num << " << 8))\n"; + } + text << "\n"; + + group_num++; + } + + text << "#define MAP_GROUPS_COUNT " << group_num << "\n\n"; + text << "#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n"; + + return text.str(); +} + +void process_groups(string groups_filepath) { + string err; + Json groups_data = Json::parse(read_text_file(groups_filepath), err); + + if (groups_data == Json()) + FATAL_ERROR("%s\n", err.c_str()); + + string groups_text = generate_groups_text(groups_data); + string connections_text = generate_connections_text(groups_data); + string headers_text = generate_headers_text(groups_data); + string events_text = generate_events_text(groups_data); + string map_header_text = generate_map_constants_text(groups_filepath, groups_data); + + string file_dir = get_directory_name(groups_filepath); + char s = file_dir.back(); + + write_text_file(file_dir + "groups.inc", groups_text); + write_text_file(file_dir + "connections.inc", connections_text); + write_text_file(file_dir + "headers.inc", headers_text); + write_text_file(file_dir + "events.inc", events_text); + write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "map_groups.h", map_header_text); +} + +string generate_layout_headers_text(Json layouts_data) { + ostringstream text; + + for (auto &layout : layouts_data["layouts"].array_items()) { + string border_label = layout["name"].string_value() + "_Border"; + string blockdata_label = layout["name"].string_value() + "_Blockdata"; + text << border_label << "::\n" + << "\t.incbin \"" << layout["border_filepath"].string_value() << "\"\n\n" + << blockdata_label << "::\n" + << "\t.incbin \"" << layout["blockdata_filepath"].string_value() << "\"\n\n" + << "\t.align 2\n" + << layout["name"].string_value() << "::\n" + << "\t.4byte " << layout["width"].int_value() << "\n" + << "\t.4byte " << layout["height"].int_value() << "\n" + << "\t.4byte " << border_label << "\n" + << "\t.4byte " << blockdata_label << "\n" + << "\t.4byte " << layout["primary_tileset"].string_value() << "\n" + << "\t.4byte " << layout["secondary_tileset"].string_value() << "\n\n"; + } + + return text.str(); +} + +string generate_layouts_table_text(Json layouts_data) { + ostringstream text; + + text << "\t.align 2\n" + << layouts_data["layouts_table_label"].string_value() << "::\n"; + + for (auto &layout : layouts_data["layouts"].array_items()) + text << "\t.4byte " << layout["name"].string_value() << "\n"; + + return text.str(); +} + +string generate_layouts_constants_text(Json layouts_data) { + ostringstream text; + + text << "#ifndef GUARD_CONSTANTS_LAYOUTS_H\n" + << "#define GUARD_CONSTANTS_LAYOUTS_H\n\n"; + + int i = 0; + for (auto &layout : layouts_data["layouts"].array_items()) + text << "#define " << layout["id"].string_value() << " " << ++i << "\n"; + + text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n"; + + return text.str(); +} + +void process_layouts(string layouts_filepath) { + string err; + Json layouts_data = Json::parse(read_text_file(layouts_filepath), err); + + if (layouts_data == Json()) + FATAL_ERROR("%s\n", err.c_str()); + + string layout_headers_text = generate_layout_headers_text(layouts_data); + string layouts_table_text = generate_layouts_table_text(layouts_data); + string layouts_constants_text = generate_layouts_constants_text(layouts_data); + + string file_dir = get_directory_name(layouts_filepath); + char s = file_dir.back(); + + write_text_file(file_dir + "layouts.inc", layout_headers_text); + write_text_file(file_dir + "layouts_table.inc", layouts_table_text); + write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "layouts.h", layouts_constants_text); +} + +int main(int argc, char *argv[]) { + if (argc < 2) + FATAL_ERROR("USAGE: mapjson [options]\n"); + + char *mode_arg = argv[1]; + string mode(mode_arg); + if (mode != "layouts" && mode != "map" && mode != "groups") + FATAL_ERROR("ERROR: must be 'layouts', 'map', or 'groups'.\n"); + + if (mode == "map") { + if (argc != 4) + FATAL_ERROR("USAGE: mapjson map \n"); + + string filepath(argv[2]); + string layouts_filepath(argv[3]); + + process_map(filepath, layouts_filepath); + } + else if (mode == "groups") { + if (argc != 3) + FATAL_ERROR("USAGE: mapjson groups \n"); + + string filepath(argv[2]); + + process_groups(filepath); + } + else if (mode == "layouts") { + if (argc != 3) + FATAL_ERROR("USAGE: mapjson layouts \n"); + + string filepath(argv[2]); + + process_layouts(filepath); + } + + return 0; +} diff --git a/tools/mapjson/mapjson.h b/tools/mapjson/mapjson.h new file mode 100644 index 0000000000..6e961a28ec --- /dev/null +++ b/tools/mapjson/mapjson.h @@ -0,0 +1,31 @@ +// mapjson.h + +#ifndef MAPJSON_H +#define MAPJSON_H + +#include +using std::fprintf; using std::exit; + +#include + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#else + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#endif // _MSC_VER + +#endif // MAPJSON_H diff --git a/tools/mapjson/mapjson.py b/tools/mapjson/mapjson.py deleted file mode 100755 index 28322a2de2..0000000000 --- a/tools/mapjson/mapjson.py +++ /dev/null @@ -1,389 +0,0 @@ -# mapjson.py - -import os -import re -import sys -import json - - -def abort(message): - print message - sys.exit() - - -def write_text_file(filepath, text): - with open(filepath, 'w') as f: - f.write(text) - - -def generate_map_header_text(map_data, layouts_data): - matched_layouts = filter(lambda layout: layout['id'] == map_data['layout'], layouts_data['layouts']) - if len(matched_layouts) != 1: - abort('Failed to find matching layout for "%s"' % (map_data['layout'])) - layout = matched_layouts[0] - text = '%s:\n' % (map_data['name']) - text += '\t.4byte %s\n' % (layout['name']) - - if 'shared_events_map' in map_data: - text += '\t.4byte %s\n' % (map_data['shared_events_map'] + '_MapEvents') - else: - text += '\t.4byte %s\n' % (map_data['name'] + '_MapEvents') - - if 'shared_scripts_map' in map_data: - text += '\t.4byte %s\n' % (map_data['shared_scripts_map'] + '_MapScripts') - else: - text += '\t.4byte %s\n' % (map_data['name'] + '_MapScripts') - - if map_data['connections'] is not None and len(map_data['connections']) > 0: - text += '\t.4byte %s\n' % (map_data['name'] + '_MapConnections') - else: - text += '\t.4byte 0x0\n' - - text += '\t.2byte %s\n' % (map_data['music']) - text += '\t.2byte %s\n' % (layout['id']) - text += '\t.byte %s\n' % (map_data['region_map_section']) - text += '\t.byte %s\n' % (int(map_data['requires_flash'])) - text += '\t.byte %s\n' % (map_data['weather']) - text += '\t.byte %s\n' % (map_data['map_type']) - text += '\t.2byte 0\n' - text += '\tmap_header_flags allow_bike=%s, allow_escape_rope=%s, allow_run=%s, show_map_name=%s\n' % (int(map_data['allow_bike']), int(map_data['allow_escape_rope']), int(map_data['allow_running']), int(map_data['show_map_name'])) - text += '\t.byte %s\n\n' % (map_data['battle_scene']) - return text - - -def generate_map_connections_text(map_data): - if map_data['connections'] is None: - return '\n' - - label = '%s_MapConnectionsList' % (map_data['name']) - text = '%s:\n' % (label) - for connection in map_data['connections']: - text += '\tconnection %s, %s, %s\n' % (connection['direction'], connection['offset'], connection['map']) - - text += '\n%s_MapConnections:\n' % (map_data['name']) - text += '\t.4byte %s\n' % (len(map_data['connections'])) - text += '\t.4byte %s\n\n' % (label) - return text - - -def generate_map_events_text(map_data): - if 'shared_events_map' in map_data: - return '\n' - - text = '' - if len(map_data['object_events']) > 0: - objects_label = '%s_EventObjects' % (map_data['name']) - text += '%s:\n' % (objects_label) - for i, obj in enumerate(map_data['object_events']): - text += '\tobject_event %s, %s, 0, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s\n' % ( - i + 1, - obj['graphics_id'], - obj['x'], - obj['y'], - obj['elevation'], - obj['movement_type'], - obj['movement_range_x'], - obj['movement_range_y'], - obj['trainer_type'], - obj['trainer_sight_or_berry_tree_id'], - obj['script'], - obj['flag']) - text += '\n' - else: - objects_label = '0x0' - - if len(map_data['warp_events']) > 0: - warps_label = '%s_MapWarps' % (map_data['name']) - text += '%s:\n' % (warps_label) - for i, warp in enumerate(map_data['warp_events']): - text += '\twarp_def %s, %s, %s, %s, %s\n' % ( - warp['x'], - warp['y'], - warp['elevation'], - warp['dest_warp_id'], - warp['dest_map']) - text += '\n' - else: - warps_label = '0x0' - - if len(map_data['coord_events']) > 0: - coords_label = '%s_MapCoordEvents' % (map_data['name']) - text += '%s:\n' % (coords_label) - for i, event in enumerate(map_data['coord_events']): - if event['type'] == 'trigger': - text += '\tcoord_event %s, %s, %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['var'], - event['var_value'], - event['script']) - elif event['type'] == 'weather': - text += '\tcoord_weather_event %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['weather']) - text += '\n' - else: - coords_label = '0x0' - - if len(map_data['bg_events']) > 0: - bgs_label = '%s_MapBGEvents' % (map_data['name']) - text += '%s:\n' % (bgs_label) - for i, event in enumerate(map_data['bg_events']): - if event['type'] == 'sign': - text += '\tbg_event %s, %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['player_facing_dir'], - event['script']) - elif event['type'] == 'hidden_item': - text += '\tbg_hidden_item_event %s, %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['item'], - event['flag']) - elif event['type'] == 'secret_base': - text += '\tbg_secret_base_event %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['secret_base_id']) - text += '\n' - else: - bgs_label = '0x0' - - text += '%s_MapEvents::\n' % (map_data['name']) - text += '\tmap_events %s, %s, %s, %s\n\n' % (objects_label, warps_label, coords_label, bgs_label) - return text - - -def process_map(map_filepath, layouts_filepath): - with open(map_filepath) as f: - map_data = json.load(f) - with open(layouts_filepath) as f: - layouts_data = json.load(f) - - header_text = generate_map_header_text(map_data, layouts_data) - events_text = generate_map_events_text(map_data) - connections_text = generate_map_connections_text(map_data) - - files_dir = os.path.dirname(map_filepath) - write_text_file(os.path.join(files_dir, 'header.inc'), header_text) - write_text_file(os.path.join(files_dir, 'events.inc'), events_text) - write_text_file(os.path.join(files_dir, 'connections.inc'), connections_text) - - -def generate_groups_text(groups_data): - text = '' - for group in groups_data['group_order']: - text += '%s::\n' % (group) - maps = groups_data[group] - for map_name in maps: - text += '\t.4byte %s\n' % (map_name) - text += '\n' - - text += '\t.align 2\n' - text += 'gMapGroups::\n' - for group in groups_data['group_order']: - text += '\t.4byte %s\n' % (group) - text += '\n' - return text - - -def index_of(in_list, value): - try: - index_value = in_list.index(value) - except ValueError: - index_value = sys.maxint - return index_value - - -def generate_connections_text(groups_data): - map_names = [] - for group in groups_data['group_order']: - for map_name in groups_data[group]: - map_names.append(map_name) - - if 'connections_include_order' in groups_data: - map_names.sort(key=lambda x: index_of(groups_data['connections_include_order'], x)) - - text = '' - for map_name in map_names: - text += '\t.include "data/maps/%s/connections.inc"\n' % (map_name) - - return text - - -def generate_headers_text(groups_data): - map_names = [] - for group in groups_data['group_order']: - for map_name in groups_data[group]: - map_names.append(map_name) - - text = '' - for map_name in map_names: - text += '\t.include "data/maps/%s/header.inc"\n' % (map_name) - - return text - - -def generate_events_text(groups_data): - map_names = [] - for group in groups_data['group_order']: - for map_name in groups_data[group]: - map_names.append(map_name) - - text = '' - for map_name in map_names: - text += '\t.include "data/maps/%s/events.inc"\n' % (map_name) - - return text - - -def generate_map_constants_text(groups_filepath, groups_data): - file_dir = os.path.dirname(groups_filepath) - text = '#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n' - text += '#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n' - - for i, group in enumerate(groups_data['group_order']): - text += '// Map Group %s\n' % (i) - map_ids = [] - max_length = 0 - for map_name in groups_data[group]: - header_filepath = os.path.join(file_dir, map_name, 'map.json') - with open(header_filepath) as f: - map_data = json.load(f) - map_ids.append(map_data['id']) - if len(map_data['id']) > max_length: - max_length = len(map_data['id']) - - for j, map_id in enumerate(map_ids): - text += '#define %s%s(%s | (%s << 8))\n' % (map_id, " " * (max_length - len(map_id) + 1), j, i) - - text += '\n' - - text += '#define MAP_GROUPS_COUNT %s\n\n' % (len(groups_data['group_order'])) - text += '#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n' - - return text - - -def process_groups(groups_filepath): - with open(groups_filepath) as f: - groups_data = json.load(f) - - groups_text = generate_groups_text(groups_data) - connections_text = generate_connections_text(groups_data) - headers_text = generate_headers_text(groups_data) - events_text = generate_events_text(groups_data) - map_header_text = generate_map_constants_text(groups_filepath, groups_data) - - file_dir = os.path.dirname(groups_filepath) - write_text_file(os.path.join(file_dir, 'groups.inc'), groups_text) - write_text_file(os.path.join(file_dir, 'connections.inc'), connections_text) - write_text_file(os.path.join(file_dir, 'headers.inc'), headers_text) - write_text_file(os.path.join(file_dir, 'events.inc'), events_text) - write_text_file(os.path.join(file_dir, '../../include/constants/map_groups.h'), map_header_text) - - -def generate_layout_headers_text(layouts_data): - text = '' - for layout in layouts_data['layouts']: - border_label = layout['name'] + '_Border' - blockdata_label = layout['name'] + '_Blockdata' - text += '%s::\n' % (border_label) - text += '\t.incbin "%s"\n\n' % (layout['border_filepath']) - text += '%s::\n' % (blockdata_label) - text += '\t.incbin "%s"\n\n' % (layout['blockdata_filepath']) - text += '\t.align 2\n' - text += '%s::\n' % (layout['name']) - text += '\t.4byte %s\n' % (layout['width']) - text += '\t.4byte %s\n' % (layout['height']) - text += '\t.4byte %s\n' % (border_label) - text += '\t.4byte %s\n' % (blockdata_label) - text += '\t.4byte %s\n' % (layout['primary_tileset']) - text += '\t.4byte %s\n\n' % (layout['secondary_tileset']) - - return text - - -def generate_layouts_table_text(layouts_data): - text = '\t.align 2\n' - text += '%s::\n' % (layouts_data['layouts_table_label']) - for layout in layouts_data['layouts']: - text += '\t.4byte %s\n' % (layout['name']) - - return text - - -def generate_layouts_constants_text(layouts_data): - text = '#ifndef GUARD_CONSTANTS_LAYOUTS_H\n' - text += '#define GUARD_CONSTANTS_LAYOUTS_H\n\n' - for i, layout in enumerate(layouts_data['layouts']): - text += '#define %s %s\n' % (layout['id'], i + 1) - text += '\n' - text += '#endif // GUARD_CONSTANTS_LAYOUTS_H\n' - return text - - -def process_layouts(layouts_filepath): - with open(layouts_filepath) as f: - layouts_data = json.load(f) - - layout_headers_text = generate_layout_headers_text(layouts_data) - layouts_table_text = generate_layouts_table_text(layouts_data) - layouts_constants_text = generate_layouts_constants_text(layouts_data) - - file_dir = os.path.dirname(layouts_filepath) - write_text_file(os.path.join(file_dir, 'layouts.inc'), layout_headers_text) - write_text_file(os.path.join(file_dir, 'layouts_table.inc'), layouts_table_text) - write_text_file(os.path.join(file_dir, '../../include/constants/layouts.h'), layouts_constants_text) - - -def main(): - if len(sys.argv) < 2: - abort('USAGE: python mapjson.py [options]') - - mode = sys.argv[1] - if mode not in ['layouts', 'map', 'groups']: - abort("ERROR: must be 'layouts', 'map', or 'groups'.") - - if mode == 'map': - if len(sys.argv) != 4: - abort('USAGE: python mapjson.py map ') - - filepath = sys.argv[2] - if not os.path.exists(filepath): - abort('ERROR: Map file "%s" does not exist' % (filepath)) - - layouts_filepath = sys.argv[3] - if not os.path.exists(layouts_filepath): - abort('ERROR: Layouts file "%s" does not exist' % (layouts_filepath)) - - process_map(filepath, layouts_filepath) - elif mode == 'groups': - if len(sys.argv) != 3: - abort('USAGE: python mapjson.py groups ') - - filepath = sys.argv[2] - if not os.path.exists(filepath): - abort('ERROR: Map file "%s" does not exist' % (filepath)) - - process_groups(filepath) - elif mode == 'layouts': - if len(sys.argv) != 3: - abort('USAGE: python mapjson.py layouts ') - - filepath = sys.argv[2] - if not os.path.exists(filepath): - abort('ERROR: Layouts file "%s" does not exist' % (filepath)) - - process_layouts(filepath) - - -if __name__ == '__main__': - main() From 804e955c8d3c57b7ee8ed90ca59ab732f8eeeae1 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 4 Feb 2019 11:38:44 +0000 Subject: [PATCH 39/42] Label some more functions --- src/pokemon_summary_screen.c | 84 +++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b05f3129b5..f88a2470a4 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -184,10 +184,10 @@ static void PrintPageNamesAndStatsPageToWindows(void); static void sub_81C2AFC(u8 a); static void sub_81C2C38(u8 a); static void SummaryScreen_RemoveWindowByIndex(u8 a); -static void sub_81C2D9C(u8 a); -static void sub_81C2DE4(u8 a); -static void sub_81C2E00(void); -static void sub_81C2E40(u8 taskId); +static void PrintPageSpecificText(u8 a); +static void CreateTextPrinterTask(u8 a); +static void PrintInfoPageText(void); +static void sTask_PrintInfoPage(u8 taskId); static void PrintMonOTName(void); static void PrintMonOTID(void); static void PrintMonAbilityName(void); @@ -203,27 +203,27 @@ static void PrintEggOTName(void); static void PrintEggOTID(void); static void PrintEggState(void); static void PrintEggMemo(void); -static void sub_81C3554(u8 taskId); +static void sTask_PrintSkillsPage(u8 taskId); static void PrintHeldItemName(void); -static void sub_81C3530(void); +static void PrintSkillsPageText(void); static void PrintRibbonCount(void); static void BufferLeftColumnStats(void); static void PrintLeftColumnStats(void); static void BufferRightColumnStats(void); static void PrintRightColumnStats(void); static void PrintExpPointsNextLevel(void); -static void sub_81C3984(void); -static void sub_81C39F0(u8 taskId); +static void PrintBattleMoves(void); +static void sTask_PrintBattleMoves(u8 taskId); static void PrintMoveNameAndPP(u8 a); -static void sub_81C3D08(void); -static void sub_81C3D54(u8 taskId); +static void PrintContestMoves(void); +static void sTask_PrintContestMoves(u8 taskId); static void PrintContestMoveDescription(u8 a); static void PrintMoveDetails(u16 a); static void PrintNewMoveDetailsOrCancelText(void); static void sub_81C4064(void); static void sub_81C40A0(u8 a, u8 b); static void PrintHMMovesCantBeForgotten(void); -static void ResetPssSpriteIds(void); +static void ResetSpriteIds(void); static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible); static void HidePageSpecificSprites(void); static void SetTypeIcons(void); @@ -626,22 +626,26 @@ static const u8 sTextColors_861CD2C[][3] = {0, 5, 6}, {0, 7, 8} }; + static const u8 gUnknown_0861CD53[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp"); static const u8 gUnknown_0861CDD3[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp"); -static void (*const gUnknown_0861CE54[])(void) = + +static void (*const sTextPrinterFunctions[])(void) = { - sub_81C2E00, - sub_81C3530, - sub_81C3984, - sub_81C3D08 + PrintInfoPageText, + PrintSkillsPageText, + PrintBattleMoves, + PrintContestMoves }; -static void (*const gUnknown_0861CE64[])(u8 taskId) = + +static void (*const sTextPrinterTasks[])(u8 taskId) = { - sub_81C2E40, - sub_81C3554, - sub_81C39F0, - sub_81C3D54 + sTask_PrintInfoPage, + sTask_PrintSkillsPage, + sTask_PrintBattleMoves, + sTask_PrintContestMoves }; + static const u8 gUnknown_0861CE74[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); static const u8 gUnknown_0861CE7B[] = _("{COLOR WHITE}{SHADOW DARK_GREY}"); static const u8 gUnknown_0861CE82[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}"); @@ -1129,7 +1133,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 13: - sub_81C2D9C(pssData->currPageIndex); + PrintPageSpecificText(pssData->currPageIndex); gMain.state++; break; case 14: @@ -1141,7 +1145,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 16: - ResetPssSpriteIds(); + ResetSpriteIds(); CreateMoveTypeIcons(); pssData->unk40F0 = 0; gMain.state++; @@ -1573,7 +1577,7 @@ static void sub_81C0704(u8 taskId) sub_81C25E8(); break; case 11: - sub_81C2D9C(pssData->currPageIndex); + PrintPageSpecificText(pssData->currPageIndex); sub_81C2524(); break; case 12: @@ -1676,7 +1680,7 @@ static void sub_81C0A8C(u8 taskId, s8 b) SetTaskFuncWithFollowupFunc(taskId, sub_81C0B8C, gTasks[taskId].func); else SetTaskFuncWithFollowupFunc(taskId, sub_81C0CC4, gTasks[taskId].func); - sub_81C2DE4(pssData->currPageIndex); + CreateTextPrinterTask(pssData->currPageIndex); HidePageSpecificSprites(); } @@ -2910,7 +2914,7 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) } } -static void sub_81C2D9C(u8 pageIndex) +static void PrintPageSpecificText(u8 pageIndex) { u16 i; for (i = 0; i < 8; i++) @@ -2918,15 +2922,15 @@ static void sub_81C2D9C(u8 pageIndex) if (pssData->windowIds[i] != 0xFF) FillWindowPixelBuffer(pssData->windowIds[i], 0); } - gUnknown_0861CE54[pageIndex](); + sTextPrinterFunctions[pageIndex](); } -static void sub_81C2DE4(u8 pageIndex) +static void CreateTextPrinterTask(u8 pageIndex) { - CreateTask(gUnknown_0861CE64[pageIndex], 16); + CreateTask(sTextPrinterTasks[pageIndex], 16); } -static void sub_81C2E00(void) +static void PrintInfoPageText(void) { if (pssData->summary.isEgg) { @@ -2946,7 +2950,7 @@ static void sub_81C2E00(void) } } -static void sub_81C2E40(u8 taskId) +static void sTask_PrintInfoPage(u8 taskId) { s16 *data = gTasks[taskId].data; switch (data[0]) @@ -3200,7 +3204,7 @@ static void PrintEggMemo(void) SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 3), text, 0, 1, 0, 0); } -static void sub_81C3530(void) +static void PrintSkillsPageText(void) { PrintHeldItemName(); PrintRibbonCount(); @@ -3211,7 +3215,7 @@ static void sub_81C3530(void) PrintExpPointsNextLevel(); } -static void sub_81C3554(u8 taskId) +static void sTask_PrintSkillsPage(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3357,7 +3361,7 @@ static void PrintExpPointsNextLevel(void) SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 17, 0, 0); } -static void sub_81C3984(void) +static void PrintBattleMoves(void) { PrintMoveNameAndPP(0); PrintMoveNameAndPP(1); @@ -3379,7 +3383,7 @@ static void sub_81C3984(void) } } -static void sub_81C39F0(u8 taskId) +static void sTask_PrintBattleMoves(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3493,7 +3497,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) } } -static void sub_81C3D08(void) +static void PrintContestMoves(void) { PrintMoveNameAndPP(0); PrintMoveNameAndPP(1); @@ -3507,7 +3511,7 @@ static void sub_81C3D08(void) } } -static void sub_81C3D54(u8 taskId) +static void sTask_PrintContestMoves(u8 taskId) { s16 *data = gTasks[taskId].data; s16 dataa = data[0] - 1; @@ -3641,11 +3645,11 @@ static void PrintHMMovesCantBeForgotten(void) SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } -static void ResetPssSpriteIds(void) +static void ResetSpriteIds(void) { u8 i; - for (i = 0; i < 28; i++) + for (i = 0; i < ARRAY_COUNT(pssData->spriteIds); i++) { pssData->spriteIds[i] = 0xFF; } @@ -3670,7 +3674,7 @@ static void HidePageSpecificSprites(void) // Keeps Pokémon, caught ball and status sprites visible. u8 i; - for (i = 3; i < 28; i++) + for (i = 3; i < ARRAY_COUNT(pssData->spriteIds); i++) { if (pssData->spriteIds[i] != 0xFF) SetSpriteInvisibility(i, TRUE); From 3d79aeb9da19a0488c87400100056ad04d9c165a Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 4 Feb 2019 12:44:09 +0000 Subject: [PATCH 40/42] More documentation --- src/pokemon_summary_screen.c | 143 ++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f88a2470a4..2a241620f7 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -43,10 +43,11 @@ #include "constants/items.h" #include "constants/moves.h" #include "constants/region_map_sections.h" +#include "constants/rgb.h" #include "constants/songs.h" #include "constants/species.h" -static EWRAM_DATA struct UnkSummaryStruct +static EWRAM_DATA struct PssData { /*0x00*/ union { struct Pokemon *mons; @@ -135,21 +136,21 @@ static bool8 SummaryScreen_DecompressGraphics(void); static void CopyMonToSummaryStruct(struct Pokemon* a); static bool8 ExtractMonDataToSummaryStruct(struct Pokemon* a); static void sub_81C0348(void); -static void sub_81C0484(u8 taskId); -static void sub_81C0510(u8 taskId); -static void sub_81C0604(u8 taskId, s8 a); +static void CloseSummaryScreen(u8 taskId); +static void HandleInput(u8 taskId); +static void ChangePokemon(u8 taskId, s8 a); static void sub_81C0704(u8 taskId); static s8 sub_81C08F8(s8 a); static s8 sub_81C09B4(s8 a); static bool8 sub_81C0A50(struct Pokemon* mon); -static void sub_81C0A8C(u8 taskId, s8 a); +static void ChangePage(u8 taskId, s8 a); static void sub_81C0B8C(u8 taskId); static void sub_81C0C68(u8 taskId); static void sub_81C0CC4(u8 taskId); static void sub_81C0D44(u8 taskId); static void sub_81C0E24(void); static void sub_81C0E48(u8 taskId); -static void sub_81C0F44(u8 taskId); +static void HandleInput_MoveSelect(u8 taskId); static bool8 sub_81C1040(void); static void sub_81C1070(s16* a, s8 b, u8* c); static void sub_81C11F4(u8 a); @@ -175,19 +176,19 @@ static void sub_81C2228(struct Pokemon* mon); static void DrawExperienceProgressBar(struct Pokemon* mon); static void DrawContestMoveHearts(u16 move); static void sub_81C2524(void); -static void sub_81C2554(void); +static void ResetWindows(void); static void sub_81C25E8(void); static void sub_81C2628(void); static void sub_81C2794(void); static void sub_81C27DC(struct Pokemon *mon, u16 a); static void PrintPageNamesAndStatsPageToWindows(void); -static void sub_81C2AFC(u8 a); -static void sub_81C2C38(u8 a); +static void CreatePageWindowTilemaps(u8 a); +static void ClearPageWindowTilemaps(u8 a); static void SummaryScreen_RemoveWindowByIndex(u8 a); static void PrintPageSpecificText(u8 a); static void CreateTextPrinterTask(u8 a); static void PrintInfoPageText(void); -static void sTask_PrintInfoPage(u8 taskId); +static void Task_PrintInfoPage(u8 taskId); static void PrintMonOTName(void); static void PrintMonOTID(void); static void PrintMonAbilityName(void); @@ -203,7 +204,7 @@ static void PrintEggOTName(void); static void PrintEggOTID(void); static void PrintEggState(void); static void PrintEggMemo(void); -static void sTask_PrintSkillsPage(u8 taskId); +static void Task_PrintSkillsPage(u8 taskId); static void PrintHeldItemName(void); static void PrintSkillsPageText(void); static void PrintRibbonCount(void); @@ -213,10 +214,10 @@ static void BufferRightColumnStats(void); static void PrintRightColumnStats(void); static void PrintExpPointsNextLevel(void); static void PrintBattleMoves(void); -static void sTask_PrintBattleMoves(u8 taskId); +static void Task_PrintBattleMoves(u8 taskId); static void PrintMoveNameAndPP(u8 a); static void PrintContestMoves(void); -static void sTask_PrintContestMoves(u8 taskId); +static void Task_PrintContestMoves(u8 taskId); static void PrintContestMoveDescription(u8 a); static void PrintMoveDetails(u16 a); static void PrintNewMoveDetailsOrCancelText(void); @@ -640,10 +641,10 @@ static void (*const sTextPrinterFunctions[])(void) = static void (*const sTextPrinterTasks[])(u8 taskId) = { - sTask_PrintInfoPage, - sTask_PrintSkillsPage, - sTask_PrintBattleMoves, - sTask_PrintContestMoves + Task_PrintInfoPage, + Task_PrintSkillsPage, + Task_PrintBattleMoves, + Task_PrintContestMoves }; static const u8 gUnknown_0861CE74[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); @@ -1108,7 +1109,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 7: - sub_81C2554(); + ResetWindows(); gMain.state++; break; case 8: @@ -1141,7 +1142,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 15: - sub_81C2AFC(pssData->currPageIndex); + CreatePageWindowTilemaps(pssData->currPageIndex); gMain.state++; break; case 16: @@ -1176,7 +1177,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 22: if (pssData->mode != PSS_MODE_SELECT_MOVE) - CreateTask(sub_81C0510, 0); + CreateTask(HandleInput, 0); else CreateTask(sub_81C171C, 0); gMain.state++; @@ -1186,7 +1187,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 24: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -1406,13 +1407,13 @@ static void sub_81C0434(void) Free(pssData); } -static void sub_81C044C(u8 taskId) +static void BeginCloseSummaryScreen(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - gTasks[taskId].func = sub_81C0484; + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + gTasks[taskId].func = CloseSummaryScreen; } -static void sub_81C0484(u8 taskId) +static void CloseSummaryScreen(u8 taskId) { if (sub_81221EC() != TRUE && !gPaletteFade.active) { @@ -1430,25 +1431,25 @@ static void sub_81C0484(u8 taskId) } } -static void sub_81C0510(u8 taskId) +static void HandleInput(u8 taskId) { if (sub_81221EC() != TRUE && !gPaletteFade.active) { if (gMain.newKeys & DPAD_UP) { - sub_81C0604(taskId, -1); + ChangePokemon(taskId, -1); } else if (gMain.newKeys & DPAD_DOWN) { - sub_81C0604(taskId, 1); + ChangePokemon(taskId, 1); } else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1) { - sub_81C0A8C(taskId, -1); + ChangePage(taskId, -1); } else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysState() == 2) { - sub_81C0A8C(taskId, 1); + ChangePage(taskId, 1); } else if (gMain.newKeys & A_BUTTON) { @@ -1458,7 +1459,7 @@ static void sub_81C0510(u8 taskId) { sub_81C48F0(); PlaySE(SE_SELECT); - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } else { @@ -1471,12 +1472,12 @@ static void sub_81C0510(u8 taskId) { sub_81C48F0(); PlaySE(SE_SELECT); - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } } } -static void sub_81C0604(u8 taskId, s8 a) +static void ChangePokemon(u8 taskId, s8 a) { s8 r4_2; @@ -1587,7 +1588,7 @@ static void sub_81C0704(u8 taskId) if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0) { data[0] = 0; - gTasks[taskId].func = sub_81C0510; + gTasks[taskId].func = HandleInput; } return; } @@ -1660,7 +1661,7 @@ static bool8 sub_81C0A50(struct Pokemon* mon) return FALSE; } -static void sub_81C0A8C(u8 taskId, s8 b) +static void ChangePage(u8 taskId, s8 b) { struct PokeSummary *summary = &pssData->summary; s16 *data = gTasks[taskId].data; @@ -1673,7 +1674,7 @@ static void sub_81C0A8C(u8 taskId, s8 b) return; PlaySE(SE_SELECT); - sub_81C2C38(pssData->currPageIndex); + ClearPageWindowTilemaps(pssData->currPageIndex); pssData->currPageIndex += b; data[0] = 0; if (b == 1) @@ -1721,7 +1722,7 @@ static void sub_81C0C68(u8 taskId) data[1] = 0; data[0] = 0; sub_81C1BA0(); - sub_81C2AFC(pssData->currPageIndex); + CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); @@ -1770,7 +1771,7 @@ static void sub_81C0D44(u8 taskId) data[1] = 0; data[0] = 0; sub_81C1BA0(); - sub_81C2AFC(pssData->currPageIndex); + CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); @@ -1806,10 +1807,10 @@ static void sub_81C0E48(u8 taskId) schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); sub_81C4AF8(8); - gTasks[taskId].func = sub_81C0F44; + gTasks[taskId].func = HandleInput_MoveSelect; } -static void sub_81C0F44(u8 taskId) +static void HandleInput_MoveSelect(u8 taskId) { u8 id = taskId; s16 *data = gTasks[taskId].data; @@ -1934,7 +1935,7 @@ static void sub_81C11F4(u8 taskId) schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); - gTasks[taskId].func = sub_81C0510; + gTasks[taskId].func = HandleInput; } static void sub_81C129C(u8 taskId) @@ -2010,7 +2011,7 @@ static void sub_81C13B0(u8 taskId, bool8 b) DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); - gTasks[taskId].func = sub_81C0F44; + gTasks[taskId].func = HandleInput_MoveSelect; } static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) @@ -2110,11 +2111,11 @@ static void sub_81C174C(u8 taskId) } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { - sub_81C0A8C(taskId, -1); + ChangePage(taskId, -1); } else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2) { - sub_81C0A8C(taskId, 1); + ChangePage(taskId, 1); } else if (gMain.newKeys & A_BUTTON) { @@ -2124,7 +2125,7 @@ static void sub_81C174C(u8 taskId) PlaySE(SE_SELECT); gUnknown_0203CF21 = pssData->firstMoveIndex; gSpecialVar_0x8005 = gUnknown_0203CF21; - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } else { @@ -2139,7 +2140,7 @@ static void sub_81C174C(u8 taskId) PlaySE(SE_SELECT); gUnknown_0203CF21 = 4; gSpecialVar_0x8005 = 4; - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } } } @@ -2195,7 +2196,7 @@ static void sub_81C1940(u8 taskId) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; gTasks[taskId].func = sub_81C174C; - sub_81C0A8C(taskId, -1); + ChangePage(taskId, -1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } @@ -2209,7 +2210,7 @@ static void sub_81C1940(u8 taskId) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; gTasks[taskId].func = sub_81C174C; - sub_81C0A8C(taskId, 1); + ChangePage(taskId, 1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } @@ -2622,7 +2623,7 @@ static void sub_81C2524(void) ChangeBgX(3, 0, 0); } -static void sub_81C2554(void) +static void ResetWindows(void) { u8 i; InitWindows(gUnknown_0861CC24); @@ -2632,7 +2633,7 @@ static void sub_81C2554(void) { FillWindowPixelBuffer(i, 0); } - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { pssData->windowIds[i] = 0xFF; } @@ -2786,7 +2787,7 @@ static void PrintPageNamesAndStatsPageToWindows(void) SummaryScreen_PrintTextOnWindow(15, gText_Jam, 0, 17, 0, 1); } -static void sub_81C2AFC(u8 a) +static void CreatePageWindowTilemaps(u8 page) { u8 i; @@ -2795,22 +2796,22 @@ static void sub_81C2AFC(u8 a) ClearWindowTilemap(2); ClearWindowTilemap(3); - switch (a) + switch (page) { - case 0: + case PSS_PAGE_INFO: PutWindowTilemap(0); PutWindowTilemap(4); if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE) PutWindowTilemap(8); PutWindowTilemap(9); break; - case 1: + case PSS_PAGE_SKILLS: PutWindowTilemap(1); PutWindowTilemap(10); PutWindowTilemap(11); PutWindowTilemap(12); break; - case 2: + case PSS_PAGE_BATTLE_MOVES: PutWindowTilemap(2); if (pssData->mode == PSS_MODE_SELECT_MOVE) { @@ -2822,7 +2823,7 @@ static void sub_81C2AFC(u8 a) PutWindowTilemap(5); } break; - case 3: + case PSS_PAGE_CONTEST_MOVES: PutWindowTilemap(3); if (pssData->mode == PSS_MODE_SELECT_MOVE) { @@ -2836,7 +2837,7 @@ static void sub_81C2AFC(u8 a) break; } - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { PutWindowTilemap(pssData->windowIds[i]); } @@ -2844,23 +2845,23 @@ static void sub_81C2AFC(u8 a) schedule_bg_copy_tilemap_to_vram(0); } -static void sub_81C2C38(u8 a) +static void ClearPageWindowTilemaps(u8 page) { u8 i; - switch (a) + switch (page) { - case 0: + case PSS_PAGE_INFO: ClearWindowTilemap(4); if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE) ClearWindowTilemap(8); ClearWindowTilemap(9); break; - case 1: + case PSS_PAGE_SKILLS: ClearWindowTilemap(10); ClearWindowTilemap(11); ClearWindowTilemap(12); break; - case 2: + case PSS_PAGE_BATTLE_MOVES: if (pssData->mode == PSS_MODE_SELECT_MOVE) { if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) @@ -2871,7 +2872,7 @@ static void sub_81C2C38(u8 a) ClearWindowTilemap(5); } break; - case 3: + case PSS_PAGE_CONTEST_MOVES: if (pssData->mode == PSS_MODE_SELECT_MOVE) { if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) @@ -2884,7 +2885,7 @@ static void sub_81C2C38(u8 a) break; } - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { SummaryScreen_RemoveWindowByIndex(i); } @@ -2917,7 +2918,7 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) static void PrintPageSpecificText(u8 pageIndex) { u16 i; - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { if (pssData->windowIds[i] != 0xFF) FillWindowPixelBuffer(pssData->windowIds[i], 0); @@ -2950,7 +2951,7 @@ static void PrintInfoPageText(void) } } -static void sTask_PrintInfoPage(u8 taskId) +static void Task_PrintInfoPage(u8 taskId) { s16 *data = gTasks[taskId].data; switch (data[0]) @@ -3078,7 +3079,7 @@ static void PrintMonTrainerMemo(void) static void BufferNatureString(void) { - struct UnkSummaryStruct *sumStruct = pssData; + struct PssData *sumStruct = pssData; DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5); } @@ -3215,7 +3216,7 @@ static void PrintSkillsPageText(void) PrintExpPointsNextLevel(); } -static void sTask_PrintSkillsPage(u8 taskId) +static void Task_PrintSkillsPage(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3383,7 +3384,7 @@ static void PrintBattleMoves(void) } } -static void sTask_PrintBattleMoves(u8 taskId) +static void Task_PrintBattleMoves(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3434,7 +3435,7 @@ static void PrintMoveNameAndPP(u8 moveIndex) u32 ppState; const u8 *text; u32 offset; - struct UnkSummaryStruct *summaryStruct = pssData; + struct PssData *summaryStruct = pssData; u8 moveNameWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 0); u8 ppValueWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 1); u16 move = summaryStruct->summary.moves[moveIndex]; @@ -3511,7 +3512,7 @@ static void PrintContestMoves(void) } } -static void sTask_PrintContestMoves(u8 taskId) +static void Task_PrintContestMoves(u8 taskId) { s16 *data = gTasks[taskId].data; s16 dataa = data[0] - 1; From fa352cfda350dddf42e2cf5673b72069d63bbc32 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 4 Feb 2019 14:35:49 +0000 Subject: [PATCH 41/42] Some more labelling --- src/pokemon_summary_screen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2a241620f7..d878d2c9e9 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -236,7 +236,7 @@ static void SetNewMoveTypeIcon(void); static void sub_81C4568(u8 a, u8 b); static u8 CreatePokemonSprite(struct Pokemon *a, s16 *b); static u8 sub_81C47B4(struct Pokemon *unused); -static void sub_81C4844(struct Sprite *); +static void SpriteCB_Pokemon(struct Sprite *); static void sub_81C48F0(void); static void CreateMonMarkingsSprite(struct Pokemon *mon); static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon); @@ -3853,17 +3853,17 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) } } (*a1)++; - return -1; + return 0xFF; case 1: pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid); LoadCompressedSpritePalette(pal); SetMultiuseSpriteTemplateToPokemon(pal->tag, 1); (*a1)++; - return -1; + return 0xFF; } } -static void sub_81C4778(void) +static void PlayMonCry(void) { struct PokeSummary *summary = &pssData->summary; if (!summary->isEgg) @@ -3889,7 +3889,7 @@ static u8 sub_81C47B4(struct Pokemon *unused) sprite->data[0] = summary->species2; sprite->data[2] = 0; - gSprites[spriteId].callback = sub_81C4844; + gSprites[spriteId].callback = SpriteCB_Pokemon; sprite->oam.priority = 0; if (!IsMonSpriteNotFlipped(summary->species2)) @@ -3904,14 +3904,14 @@ static u8 sub_81C47B4(struct Pokemon *unused) return spriteId; } -static void sub_81C4844(struct Sprite *sprite) +static void SpriteCB_Pokemon(struct Sprite *sprite) { struct PokeSummary *summary = &pssData->summary; if (!gPaletteFade.active && sprite->data[2] != 1) { sprite->data[1] = IsMonSpriteNotFlipped(sprite->data[0]); - sub_81C4778(); + PlayMonCry(); PokemonSummaryDoMonAnimation(sprite, sprite->data[0], summary->isEgg); } } From d4125fef9bc9adb95c7a5fb5b8be903b34adc510 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 4 Feb 2019 17:28:45 -0600 Subject: [PATCH 42/42] Cleanup and add game version flag to mapjson tool --- data/maps/.gitignore | 2 +- include/constants/layouts.h | 2 +- include/constants/map_groups.h | 2 +- map_data_rules.mk | 6 ++-- tools/mapjson/.gitignore | 1 + tools/mapjson/mapjson.cpp | 60 ++++++++++++++++++++-------------- 6 files changed, 42 insertions(+), 31 deletions(-) create mode 100755 tools/mapjson/.gitignore diff --git a/data/maps/.gitignore b/data/maps/.gitignore index c07d4e03a6..59405b1767 100755 --- a/data/maps/.gitignore +++ b/data/maps/.gitignore @@ -1,4 +1,4 @@ -connections.in +connections.inc events.inc groups.inc headers.inc diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 45b37ff8bf..d12db9b33f 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -443,4 +443,4 @@ #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 #define LAYOUT_UNKNOWN_MAP_08481DBC 441 -#endif // GUARD_CONSTANTS_LAYOUTS_H +#endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 003b8c6ce6..dc2ac2f32e 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -589,4 +589,4 @@ #define MAP_GROUPS_COUNT 34 -#endif // GUARD_CONSTANTS_MAP_GROUPS_H +#endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/map_data_rules.mk b/map_data_rules.mk index 6d133eb504..5a7d9dd842 100755 --- a/map_data_rules.mk +++ b/map_data_rules.mk @@ -14,18 +14,18 @@ $(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/e $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ $(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json - $(MAPJSON) map $< $(LAYOUTS_DIR)/layouts.json + $(MAPJSON) map emerald $< $(LAYOUTS_DIR)/layouts.json $(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ; $(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ; $(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json - $(MAPJSON) groups $< + $(MAPJSON) groups emerald $< $(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ; $(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ; $(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ; include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ; $(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json - $(MAPJSON) layouts $< + $(MAPJSON) layouts emerald $< $(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; diff --git a/tools/mapjson/.gitignore b/tools/mapjson/.gitignore new file mode 100755 index 0000000000..a5d5684797 --- /dev/null +++ b/tools/mapjson/.gitignore @@ -0,0 +1 @@ +mapjson diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index e1e86b5c5f..2dd6e5b315 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -50,7 +50,7 @@ string read_text_file(string filepath) { } void write_text_file(string filepath, string text) { - ofstream out_file(filepath); + ofstream out_file(filepath, std::ofstream::binary); if (!out_file.is_open()) FATAL_ERROR("Cannot open file %s for writing.\n", filepath.c_str()); @@ -60,7 +60,7 @@ void write_text_file(string filepath, string text) { out_file.close(); } -string generate_map_header_text(Json map_data, Json layouts_data) { +string generate_map_header_text(Json map_data, Json layouts_data, string version) { string map_layout_id = map_data["layout"].string_value(); vector matched; @@ -102,13 +102,18 @@ string generate_map_header_text(Json map_data, Json layouts_data) { << "\t.byte " << map_data["requires_flash"].bool_value() << "\n" << "\t.byte " << map_data["weather"].string_value() << "\n" << "\t.byte " << map_data["map_type"].string_value() << "\n" - << "\t.2byte 0\n\t" - << "map_header_flags " - << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " - << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " - << "allow_run=" << map_data["allow_running"].bool_value() << ", " - << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n" - << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; + << "\t.2byte 0\n"; + + if (version == "ruby") + text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; + else if (version == "emerald") + text << "\tmap_header_flags " + << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " + << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " + << "allow_run=" << map_data["allow_running"].bool_value() << ", " + << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; + + text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; return text.str(); } @@ -146,7 +151,7 @@ string generate_map_events_text(Json map_data) { if (map_data["object_events"].array_items().size() > 0) { objects_label = map_data["name"].string_value() + "_EventObjects"; text << objects_label << ":\n"; - for (int i = 0; i < map_data["object_events"].array_items().size(); i++) { + for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { auto obj_event = map_data["object_events"].array_items()[i]; text << "\tobject_event " << i + 1 << ", " << obj_event["graphics_id"].string_value() << ", 0, " @@ -254,7 +259,7 @@ string get_directory_name(string filename) { return filename.substr(0, dir_pos + 1); } -void process_map(string map_filepath, string layouts_filepath) { +void process_map(string map_filepath, string layouts_filepath, string version) { string mapdata_err, layouts_err; string mapdata_json_text = read_text_file(map_filepath); @@ -268,7 +273,7 @@ void process_map(string map_filepath, string layouts_filepath) { if (layouts_data == Json()) FATAL_ERROR("%s\n", layouts_err.c_str()); - string header_text = generate_map_header_text(map_data, layouts_data); + string header_text = generate_map_header_text(map_data, layouts_data, version); string events_text = generate_map_events_text(map_data); string connections_text = generate_map_connections_text(map_data); @@ -490,8 +495,13 @@ void process_layouts(string layouts_filepath) { } int main(int argc, char *argv[]) { - if (argc < 2) - FATAL_ERROR("USAGE: mapjson [options]\n"); + if (argc < 3) + FATAL_ERROR("USAGE: mapjson [options]\n"); + + char *version_arg = argv[2]; + string version(version_arg); + if (version != "emerald" && version != "ruby") + FATAL_ERROR("ERROR: must be 'emerald' or 'ruby'.\n"); char *mode_arg = argv[1]; string mode(mode_arg); @@ -499,27 +509,27 @@ int main(int argc, char *argv[]) { FATAL_ERROR("ERROR: must be 'layouts', 'map', or 'groups'.\n"); if (mode == "map") { - if (argc != 4) - FATAL_ERROR("USAGE: mapjson map \n"); + if (argc != 5) + FATAL_ERROR("USAGE: mapjson map \n"); - string filepath(argv[2]); - string layouts_filepath(argv[3]); + string filepath(argv[3]); + string layouts_filepath(argv[4]); - process_map(filepath, layouts_filepath); + process_map(filepath, layouts_filepath, version); } else if (mode == "groups") { - if (argc != 3) - FATAL_ERROR("USAGE: mapjson groups \n"); + if (argc != 4) + FATAL_ERROR("USAGE: mapjson groups \n"); - string filepath(argv[2]); + string filepath(argv[3]); process_groups(filepath); } else if (mode == "layouts") { - if (argc != 3) - FATAL_ERROR("USAGE: mapjson layouts \n"); + if (argc != 4) + FATAL_ERROR("USAGE: mapjson layouts \n"); - string filepath(argv[2]); + string filepath(argv[3]); process_layouts(filepath); }